mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-19 10:32:02 -05:00
- Give user a chance to fix from wjst, don't just exit.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@203 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
d594c24d41
commit
2f64004924
10
start_oss.c
10
start_oss.c
@ -112,7 +112,7 @@ start_threads_(int *ndevin, int *ndevout, short y1[], short y2[],
|
|||||||
|
|
||||||
if(data.fd_in < 0) {
|
if(data.fd_in < 0) {
|
||||||
fprintf(stderr, "Cannot open %s for input.\n", dsp_in);
|
fprintf(stderr, "Cannot open %s for input.\n", dsp_in);
|
||||||
exit(-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
data.fd_out = data.fd_in;
|
data.fd_out = data.fd_in;
|
||||||
@ -146,23 +146,23 @@ start_threads_(int *ndevin, int *ndevout, short y1[], short y2[],
|
|||||||
channels = 2;
|
channels = 2;
|
||||||
if(ioctl (data.fd_in, SNDCTL_DSP_CHANNELS, &channels) == -1) {
|
if(ioctl (data.fd_in, SNDCTL_DSP_CHANNELS, &channels) == -1) {
|
||||||
fprintf (stderr, "Unable to set 2 channels for input.\n");
|
fprintf (stderr, "Unable to set 2 channels for input.\n");
|
||||||
exit (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(channels != 2) {
|
if(channels != 2) {
|
||||||
fprintf (stderr, "Unable to set 2 channels.\n");
|
fprintf (stderr, "Unable to set 2 channels.\n");
|
||||||
exit (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
format = AFMT_S16_NE;
|
format = AFMT_S16_NE;
|
||||||
if(ioctl (data.fd_in, SNDCTL_DSP_SETFMT, &format) == -1) {
|
if(ioctl (data.fd_in, SNDCTL_DSP_SETFMT, &format) == -1) {
|
||||||
fprintf (stderr, "Unable to set format for input.\n");
|
fprintf (stderr, "Unable to set format for input.\n");
|
||||||
exit (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(ioctl (data.fd_in, SNDCTL_DSP_SPEED, &rate) == -1) {
|
if(ioctl (data.fd_in, SNDCTL_DSP_SPEED, &rate) == -1) {
|
||||||
fprintf (stderr, "Unable to set rate for input\n");
|
fprintf (stderr, "Unable to set rate for input\n");
|
||||||
exit (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Audio OSS streams running normally.\n");
|
printf("Audio OSS streams running normally.\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user