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

Load shout first instead of last. This makes it more likely to block other
bd0620ff · J. Alexander Treuman · 2d8f36ce · bd0620ff · bd0620ff
Commit bd0620ff authored Jun 12, 2007 by J. Alexander Treuman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

audio.c src/audio.c +1 -1

audioOutput.h src/audioOutput.h +1 -1

No files found.
--- 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!! */

--- 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