diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:26:13 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:34:35 +0300 |
commit | 0eb321bf2c1cc0e048faff26a01f86cdd3ec254f (patch) | |
tree | 71cb9bd9ed121156d3382066c0722c73189afe04 /libao2/ao_oss.c | |
parent | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (diff) | |
download | mpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.bz2 mpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.xz |
Remove trailing whitespace from most files
Diffstat (limited to 'libao2/ao_oss.c')
-rw-r--r-- | libao2/ao_oss.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index c331f8331b..c16d55c8df 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -48,7 +48,7 @@ #include "audio_out.h" #include "audio_out_internal.h" -static const ao_info_t info = +static const ao_info_t info = { "OSS/ioctl audio output", "oss", @@ -228,7 +228,7 @@ static int control(int cmd,void *arg){ if(ao_data.format == AF_FORMAT_AC3) return CONTROL_TRUE; - + if ((fd = open(oss_mixer_device, O_RDONLY)) > 0) { ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs); @@ -289,17 +289,17 @@ static int init(int rate,int channels,int format,int flags){ oss_mixer_device=mdev; else oss_mixer_device=PATH_DEV_MIXER; - + if(mchan){ int fd, devs, i; - + if ((fd = open(oss_mixer_device, O_RDONLY)) == -1){ mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS] audio_setup: Can't open mixer device %s: %s\n", oss_mixer_device, strerror(errno)); }else{ ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs); close(fd); - + for (i=0; i<SOUND_MIXER_NRDEVICES; i++){ if(!strcasecmp(mixer_channels[i], mchan)){ if(!(devs & (1 << i))){ @@ -337,19 +337,19 @@ static int init(int rate,int channels,int format,int flags){ if(fcntl(audio_fd, F_SETFL, 0) < 0) { mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS] audio_setup: Can't make file descriptor blocking: %s\n", strerror(errno)); return 0; - } + } #endif #if defined(FD_CLOEXEC) && defined(F_SETFD) fcntl(audio_fd, F_SETFD, FD_CLOEXEC); #endif - + if(format == AF_FORMAT_AC3) { ao_data.samplerate=rate; ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); } -ac3_retry: +ac3_retry: ao_data.format=format; oss_format=format2oss(format); if (oss_format == -1) { @@ -377,7 +377,7 @@ ac3_retry: mp_msg(MSGT_AO,MSGL_V,"audio_setup: sample format: %s (requested: %s)\n", af_fmt2str_short(ao_data.format), af_fmt2str_short(format)); - + ao_data.channels = channels; if(format != AF_FORMAT_AC3) { // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it |