diff options
| author | Max Kellermann <max@duempel.org> | 2008-09-07 22:41:22 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-09-07 22:41:22 +0200 |
| commit | 3b09c54b6769c7e0c8152dde2850a88f51e2f3d9 (patch) | |
| tree | 30f28b2bfb230ce6674a08231ead1d3eac032164 /src/audioOutputs/audioOutput_shout.c | |
| parent | bed2a49fe97b8f070ace2dd37909bb06540c66bd (diff) | |
| download | mpd-3b09c54b6769c7e0c8152dde2850a88f51e2f3d9.tar.gz mpd-3b09c54b6769c7e0c8152dde2850a88f51e2f3d9.tar.xz mpd-3b09c54b6769c7e0c8152dde2850a88f51e2f3d9.zip | |
output: renamed typedef AudioOutput to struct audio_output
Also rename AudioOutputPlugin to struct audio_output_plugin, and use
forward declarations to reduce include dependencies.
Diffstat (limited to 'src/audioOutputs/audioOutput_shout.c')
| -rw-r--r-- | src/audioOutputs/audioOutput_shout.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c index c7677555c..ee21fabe6 100644 --- a/src/audioOutputs/audioOutput_shout.c +++ b/src/audioOutputs/audioOutput_shout.c @@ -107,7 +107,8 @@ static void freeShoutData(ShoutData * sd) } \ } -static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) +static int myShout_initDriver(struct audio_output *audioOutput, + ConfigParam * param) { ShoutData *sd; char *test; @@ -351,7 +352,7 @@ static void myShout_closeShoutConn(ShoutData * sd) sd->opened = 0; } -static void myShout_finishDriver(AudioOutput * audioOutput) +static void myShout_finishDriver(struct audio_output *audioOutput) { ShoutData *sd = (ShoutData *) audioOutput->data; @@ -365,7 +366,7 @@ static void myShout_finishDriver(AudioOutput * audioOutput) shout_shutdown(); } -static void myShout_dropBufferedAudio(AudioOutput * audioOutput) +static void myShout_dropBufferedAudio(struct audio_output *audioOutput) { ShoutData *sd = (ShoutData *)audioOutput->data; timer_reset(sd->timer); @@ -373,7 +374,7 @@ static void myShout_dropBufferedAudio(AudioOutput * audioOutput) /* needs to be implemented for shout */ } -static void myShout_closeDevice(AudioOutput * audioOutput) +static void myShout_closeDevice(struct audio_output *audioOutput) { ShoutData *sd = (ShoutData *) audioOutput->data; @@ -509,7 +510,7 @@ static int myShout_connect(ShoutData *sd) } } -static int myShout_openShoutConn(AudioOutput * audioOutput) +static int myShout_openShoutConn(struct audio_output *audioOutput) { ShoutData *sd = (ShoutData *) audioOutput->data; int status; @@ -550,7 +551,7 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) return 0; } -static int myShout_openDevice(AudioOutput * audioOutput) +static int myShout_openDevice(struct audio_output *audioOutput) { ShoutData *sd = (ShoutData *) audioOutput->data; @@ -598,7 +599,7 @@ static void myShout_sendMetadata(ShoutData * sd) sd->tagToSend = 0; } -static int myShout_play(AudioOutput * audioOutput, +static int myShout_play(struct audio_output *audioOutput, const char *playChunk, size_t size) { unsigned int i; @@ -662,7 +663,8 @@ static int myShout_play(AudioOutput * audioOutput, return 0; } -static void myShout_setTag(AudioOutput * audioOutput, const struct tag *tag) +static void myShout_setTag(struct audio_output *audioOutput, + const struct tag *tag) { ShoutData *sd = (ShoutData *) audioOutput->data; @@ -678,7 +680,7 @@ static void myShout_setTag(AudioOutput * audioOutput, const struct tag *tag) sd->tagToSend = 1; } -AudioOutputPlugin shoutPlugin = { +struct audio_output_plugin shoutPlugin = { "shout", NULL, myShout_initDriver, |