aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2007-06-12 17:49:31 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2007-06-12 17:49:31 +0000
commitbd0620ff72247603a0feef286b03bd98082f69fb (patch)
treea1e2e6fa125f044caacedf456929e7ded61c636f
parent2d8f36cefbbf8075cf111e3129b2ebba309cc1b3 (diff)
downloadmpd-bd0620ff72247603a0feef286b03bd98082f69fb.tar.gz
mpd-bd0620ff72247603a0feef286b03bd98082f69fb.tar.xz
mpd-bd0620ff72247603a0feef286b03bd98082f69fb.zip
Load shout first instead of last. This makes it more likely to block other
outputs, which is actually desired behaviour. This way if the shout server takes a while to respond, the shout output can block until connected without messing up other audio outputs. git-svn-id: https://svn.musicpd.org/mpd/trunk@6554 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/audio.c2
-rw-r--r--src/audioOutput.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/audio.c b/src/audio.c
index ab49fa300..906382421 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -92,6 +92,7 @@ int cmpAudioFormat(AudioFormat * f1, AudioFormat * f2)
void loadAudioDrivers(void)
{
initAudioOutputPlugins();
+ loadAudioOutputPlugin(&shoutPlugin);
loadAudioOutputPlugin(&nullPlugin);
loadAudioOutputPlugin(&alsaPlugin);
loadAudioOutputPlugin(&aoPlugin);
@@ -100,7 +101,6 @@ void loadAudioDrivers(void)
loadAudioOutputPlugin(&pulsePlugin);
loadAudioOutputPlugin(&mvpPlugin);
loadAudioOutputPlugin(&jackPlugin);
- loadAudioOutputPlugin(&shoutPlugin);
}
/* make sure initPlayerData is called before this function!! */
diff --git a/src/audioOutput.h b/src/audioOutput.h
index 3f7ecd94d..7b30c4c09 100644
--- a/src/audioOutput.h
+++ b/src/audioOutput.h
@@ -105,6 +105,7 @@ void sendMetadataToAudioOutput(AudioOutput * audioOutput, MpdTag * tag);
void printAllOutputPluginTypes(FILE * fp);
+extern AudioOutputPlugin shoutPlugin;
extern AudioOutputPlugin nullPlugin;
extern AudioOutputPlugin alsaPlugin;
extern AudioOutputPlugin aoPlugin;
@@ -113,6 +114,5 @@ extern AudioOutputPlugin osxPlugin;
extern AudioOutputPlugin pulsePlugin;
extern AudioOutputPlugin mvpPlugin;
extern AudioOutputPlugin jackPlugin;
-extern AudioOutputPlugin shoutPlugin;
#endif