diff options
Diffstat (limited to 'src/audioOutputs')
| -rw-r--r-- | src/audioOutputs/audioOutput_ao.c | 10 | ||||
| -rw-r--r-- | src/audioOutputs/audioOutput_shout.c | 4 |
2 files changed, 5 insertions, 9 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); diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c index 661acd07d..685b1cca2 100644 --- a/src/audioOutputs/audioOutput_shout.c +++ b/src/audioOutputs/audioOutput_shout.c @@ -484,9 +484,7 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) { return 0; } -static int myShout_openDevice(AudioOutput * audioOutput, - AudioFormat * audioFormat) -{ +static int myShout_openDevice(AudioOutput * audioOutput) { ShoutData * sd = (ShoutData *)audioOutput->data; audioOutput->open = 1; |