diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-11 19:55:07 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-11 19:55:07 +0000 |
| commit | d4b1ff0d03c9047db196921ce97399782e9c4700 (patch) | |
| tree | 427a2604c2a7708da857dd090b75be7eba9895b8 | |
| parent | 92b91439e01656b1e00dfe9c86d1f36ae5446abe (diff) | |
| download | mpv-d4b1ff0d03c9047db196921ce97399782e9c4700.tar.bz2 mpv-d4b1ff0d03c9047db196921ce97399782e9c4700.tar.xz | |
Use AF_FORMAT_IS_AC3 in ao_oss.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30281 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libao2/ao_oss.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index 1e369c31a1..a054d7ce07 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -179,7 +179,7 @@ static int control(int cmd,void *arg){ ao_control_vol_t *vol = (ao_control_vol_t *)arg; int fd, v, devs; - if(ao_data.format == AF_FORMAT_AC3) + if(AF_FORMAT_IS_AC3(ao_data.format)) return CONTROL_TRUE; if ((fd = open(oss_mixer_device, O_RDONLY)) > 0) @@ -297,7 +297,7 @@ static int init(int rate,int channels,int format,int flags){ fcntl(audio_fd, F_SETFD, FD_CLOEXEC); #endif - if(format == AF_FORMAT_AC3) { + if(AF_FORMAT_IS_AC3(format)) { ao_data.samplerate=rate; ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); } @@ -332,7 +332,7 @@ ac3_retry: af_fmt2str_short(ao_data.format), af_fmt2str_short(format)); ao_data.channels = channels; - if(format != AF_FORMAT_AC3) { + if(!AF_FORMAT_IS_AC3(format)) { // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it if (ao_data.channels > 2) { if ( ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels) == -1 || @@ -447,10 +447,10 @@ static void reset(void){ #endif oss_format = format2oss(ao_data.format); - if(ao_data.format == AF_FORMAT_AC3) + if(AF_FORMAT_IS_AC3(ao_data.format)) ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); ioctl (audio_fd, SNDCTL_DSP_SETFMT, &oss_format); - if(ao_data.format != AF_FORMAT_AC3) { + if(!AF_FORMAT_IS_AC3(ao_data.format)) { if (ao_data.channels > 2) ioctl (audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels); else { |