Avoid warnings.
This commit is contained in:
parent
daecaba4a3
commit
7c7bd1c359
|
@ -491,13 +491,14 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev)
|
|||
{
|
||||
int rc,arg;
|
||||
int f,c,r;
|
||||
int mixer;
|
||||
TRACE("(%p) %s\n", ossdev, ossdev->dev_name);
|
||||
|
||||
if (OSS_OpenDevice(ossdev, O_WRONLY, NULL, 0,-1,-1,-1) != 0) return FALSE;
|
||||
ioctl(ossdev->fd, SNDCTL_DSP_RESET, 0);
|
||||
|
||||
#ifdef SOUND_MIXER_INFO
|
||||
{
|
||||
int mixer;
|
||||
if ((mixer = open(ossdev->mixer_name, O_RDONLY|O_NDELAY)) >= 0) {
|
||||
mixer_info info;
|
||||
if (ioctl(mixer, SOUND_MIXER_INFO, &info) >= 0) {
|
||||
|
@ -517,7 +518,7 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev)
|
|||
OSS_CloseDevice(ossdev);
|
||||
return FALSE;
|
||||
}
|
||||
close(mixer);
|
||||
}
|
||||
#endif /* SOUND_MIXER_INFO */
|
||||
|
||||
/* FIXME: some programs compare this string against the content of the
|
||||
|
@ -626,13 +627,14 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev)
|
|||
{
|
||||
int rc,arg;
|
||||
int f,c,r;
|
||||
int mixer;
|
||||
TRACE("(%p) %s\n", ossdev, ossdev->dev_name);
|
||||
|
||||
if (OSS_OpenDevice(ossdev, O_RDONLY, NULL, 0,-1,-1,-1) != 0) return FALSE;
|
||||
ioctl(ossdev->fd, SNDCTL_DSP_RESET, 0);
|
||||
|
||||
#ifdef SOUND_MIXER_INFO
|
||||
{
|
||||
int mixer;
|
||||
if ((mixer = open(ossdev->mixer_name, O_RDONLY|O_NDELAY)) >= 0) {
|
||||
mixer_info info;
|
||||
if (ioctl(mixer, SOUND_MIXER_INFO, &info) >= 0) {
|
||||
|
@ -650,7 +652,7 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev)
|
|||
OSS_CloseDevice(ossdev);
|
||||
return FALSE;
|
||||
}
|
||||
close(mixer);
|
||||
}
|
||||
#endif /* SOUND_MIXER_INFO */
|
||||
|
||||
/* See comment in OSS_WaveOutInit */
|
||||
|
|
Loading…
Reference in New Issue