oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

don't need to pass audioFormat to openDeviceFunc

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2708 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-11-19 15:09:01 +00:00
parent a809094bc3
commit 1fd8d9a790
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/audioOutput.c
View File

@@ -126,7 +126,7 @@ int openAudioOutput(AudioOutput * audioOutput, AudioFormat * audioFormat) {
&audioOutput->inAudioFormat); &audioOutput->inAudioFormat);
} }
return audioOutput->openDeviceFunc(audioOutput, audioFormat); return audioOutput->openDeviceFunc(audioOutput);
} }
static void convertAudioFormat(AudioOutput * audioOutput, char ** chunkArgPtr, static void convertAudioFormat(AudioOutput * audioOutput, char ** chunkArgPtr,

3
src/audioOutput.h
View File

@@ -33,8 +33,7 @@ typedef int (* AudioOutputInitDriverFunc) (AudioOutput * audioOutput,
typedef void (* AudioOutputFinishDriverFunc) (AudioOutput * audioOutput); typedef void (* AudioOutputFinishDriverFunc) (AudioOutput * audioOutput);
typedef int (* AudioOutputOpenDeviceFunc) (AudioOutput * audioOutput, typedef int (* AudioOutputOpenDeviceFunc) (AudioOutput * audioOutput);
AudioFormat * audioFormat);
typedef int (* AudioOutputPlayFunc) (AudioOutput * audioOutput, typedef int (* AudioOutputPlayFunc) (AudioOutput * audioOutput,
char * playChunk, int size); char * playChunk, int size);

10
src/audioOutputs/audioOutput_ao.c
View File

@@ -179,9 +179,7 @@ static void audioOutputAo_closeDevice(AudioOutput * audioOutput) {
audioOutput->open = 0; audioOutput->open = 0;
} }
static int audioOutputAo_openDevice(AudioOutput * audioOutput, static int audioOutputAo_openDevice(AudioOutput * audioOutput) {
AudioFormat * audioFormat)
{
ao_sample_format format; ao_sample_format format;
AoData * ad = (AoData *)audioOutput->data; AoData * ad = (AoData *)audioOutput->data;
@@ -189,10 +187,10 @@ static int audioOutputAo_openDevice(AudioOutput * audioOutput,
audioOutputAo_closeDevice(audioOutput); audioOutputAo_closeDevice(audioOutput);
} }
format.bits = audioFormat->bits; format.bits = audioOutput->outAudioFormat.bits;
format.rate = audioFormat->sampleRate; format.rate = audioOutput->outAudioFormat.sampleRate;
format.byte_format = AO_FMT_NATIVE; 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); ad->device = ao_open_live(ad->driverId, &format, ad->options);

4
src/audioOutputs/audioOutput_shout.c
View File

@@ -484,9 +484,7 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
return 0; return 0;
} }
static int myShout_openDevice(AudioOutput * audioOutput, static int myShout_openDevice(AudioOutput * audioOutput) {
AudioFormat * audioFormat)
{
ShoutData * sd = (ShoutData *)audioOutput->data; ShoutData * sd = (ShoutData *)audioOutput->data;
audioOutput->open = 1; audioOutput->open = 1;