From f1dd9c209c3a1cf6826d3a38b60f638e0faeadab Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 7 Sep 2008 19:19:55 +0200 Subject: audio_format: converted typedef AudioFormat to struct audio_format Get rid of CamelCase, and don't use a typedef, so we can forward-declare it, and unclutter the include dependencies. --- src/audioOutputs/audioOutput_alsa.c | 2 +- src/audioOutputs/audioOutput_jack.c | 4 ++-- src/audioOutputs/audioOutput_oss.c | 2 +- src/audioOutputs/audioOutput_pulse.c | 2 +- src/audioOutputs/audioOutput_shout.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/audioOutputs') diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c index f0aa32713..9bb962fb5 100644 --- a/src/audioOutputs/audioOutput_alsa.c +++ b/src/audioOutputs/audioOutput_alsa.c @@ -123,7 +123,7 @@ static int alsa_testDefault(void) static int alsa_openDevice(AudioOutput * audioOutput) { AlsaData *ad = audioOutput->data; - AudioFormat *audioFormat = &audioOutput->outAudioFormat; + struct audio_format *audioFormat = &audioOutput->outAudioFormat; snd_pcm_format_t bitformat; snd_pcm_hw_params_t *hwparams; snd_pcm_sw_params_t *swparams; diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c index b8add85d9..d9b6010e5 100644 --- a/src/audioOutputs/audioOutput_jack.c +++ b/src/audioOutputs/audioOutput_jack.c @@ -118,7 +118,7 @@ static void jack_finishDriver(AudioOutput *audioOutput) static int srate(mpd_unused jack_nframes_t rate, void *data) { JackData *jd = (JackData *) ((AudioOutput*) data)->data; - AudioFormat *audioFormat = &(((AudioOutput*) data)->outAudioFormat); + struct audio_format *audioFormat = &(((AudioOutput*) data)->outAudioFormat); audioFormat->sampleRate = (int)jack_get_sample_rate(jd->client); @@ -183,7 +183,7 @@ static void shutdown_callback(void *arg) static void set_audioformat(AudioOutput *audioOutput) { JackData *jd = audioOutput->data; - AudioFormat *audioFormat = &audioOutput->outAudioFormat; + struct audio_format *audioFormat = &audioOutput->outAudioFormat; audioFormat->sampleRate = (int) jack_get_sample_rate(jd->client); DEBUG("samplerate = %d\n", audioFormat->sampleRate); diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c index 2df7d5728..0c9d408f4 100644 --- a/src/audioOutputs/audioOutput_oss.c +++ b/src/audioOutputs/audioOutput_oss.c @@ -484,7 +484,7 @@ static int oss_openDevice(AudioOutput * audioOutput) { int ret; OssData *od = audioOutput->data; - AudioFormat *audioFormat = &audioOutput->outAudioFormat; + struct audio_format *audioFormat = &audioOutput->outAudioFormat; od->channels = (mpd_sint8)audioFormat->channels; od->sampleRate = audioFormat->sampleRate; diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/audioOutputs/audioOutput_pulse.c index a67c2bae6..70e35b4d9 100644 --- a/src/audioOutputs/audioOutput_pulse.c +++ b/src/audioOutputs/audioOutput_pulse.c @@ -112,7 +112,7 @@ static int pulse_testDefault(void) static int pulse_openDevice(AudioOutput * audioOutput) { PulseData *pd; - AudioFormat *audioFormat; + struct audio_format *audioFormat; pa_sample_spec ss; time_t t; int error; diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c index 7a07f5357..e5d87dbfe 100644 --- a/src/audioOutputs/audioOutput_shout.c +++ b/src/audioOutputs/audioOutput_shout.c @@ -66,7 +66,7 @@ typedef struct _ShoutData { Timer *timer; /* just a pointer to audioOutput->outAudioFormat */ - AudioFormat *audioFormat; + struct audio_format *audioFormat; } ShoutData; static ShoutData *newShoutData(void) -- cgit v1.2.3