diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-11-19 15:09:01 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-11-19 15:09:01 +0000 |
| commit | 1fd8d9a7900acbc0434ad16700af1406a54cfebb (patch) | |
| tree | 27aed37f99b2fd1944bcbd5ccc43680d089ec64e /src/audioOutputs/audioOutput_ao.c | |
| parent | a809094bc350e8969ac734668fc983efba46ab94 (diff) | |
| download | mpd-1fd8d9a7900acbc0434ad16700af1406a54cfebb.tar.gz mpd-1fd8d9a7900acbc0434ad16700af1406a54cfebb.tar.xz mpd-1fd8d9a7900acbc0434ad16700af1406a54cfebb.zip | |
don't need to pass audioFormat to openDeviceFunc
git-svn-id: https://svn.musicpd.org/mpd/trunk@2708 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audioOutputs/audioOutput_ao.c')
| -rw-r--r-- | src/audioOutputs/audioOutput_ao.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c index 83cc176fe..db9c6d50c 100644 --- a/src/audioOutputs/audioOutput_ao.c +++ b/src/audioOutputs/audioOutput_ao.c @@ -179,9 +179,7 @@ static void audioOutputAo_closeDevice(AudioOutput * audioOutput) { audioOutput->open = 0; } -static int audioOutputAo_openDevice(AudioOutput * audioOutput, - AudioFormat * audioFormat) -{ +static int audioOutputAo_openDevice(AudioOutput * audioOutput) { ao_sample_format format; AoData * ad = (AoData *)audioOutput->data; @@ -189,10 +187,10 @@ static int audioOutputAo_openDevice(AudioOutput * audioOutput, audioOutputAo_closeDevice(audioOutput); } - format.bits = audioFormat->bits; - format.rate = audioFormat->sampleRate; + format.bits = audioOutput->outAudioFormat.bits; + format.rate = audioOutput->outAudioFormat.sampleRate; format.byte_format = AO_FMT_NATIVE; - format.channels = audioFormat->channels; + format.channels = audioOutput->outAudioFormat.channels; ad->device = ao_open_live(ad->driverId, &format, ad->options); |