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

Load shout first instead of last. This makes it more likely to block other

Browse Source 
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
This commit is contained in:
J. Alexander Treuman 2007-06-12 17:49:31 +00:00
parent 2d8f36cefb
commit bd0620ff72
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio.c
View File

@ -92,6 +92,7 @@ int cmpAudioFormat(AudioFormat * f1, AudioFormat * f2)
void loadAudioDrivers(void) void loadAudioDrivers(void)
{ {
initAudioOutputPlugins(); initAudioOutputPlugins();
loadAudioOutputPlugin(&shoutPlugin);
loadAudioOutputPlugin(&nullPlugin); loadAudioOutputPlugin(&nullPlugin);
loadAudioOutputPlugin(&alsaPlugin); loadAudioOutputPlugin(&alsaPlugin);
loadAudioOutputPlugin(&aoPlugin); loadAudioOutputPlugin(&aoPlugin);
@ -100,7 +101,6 @@ void loadAudioDrivers(void)
loadAudioOutputPlugin(&pulsePlugin); loadAudioOutputPlugin(&pulsePlugin);
loadAudioOutputPlugin(&mvpPlugin); loadAudioOutputPlugin(&mvpPlugin);
loadAudioOutputPlugin(&jackPlugin); loadAudioOutputPlugin(&jackPlugin);
loadAudioOutputPlugin(&shoutPlugin);
} }
/* make sure initPlayerData is called before this function!! */ /* make sure initPlayerData is called before this function!! */

2
src/audioOutput.h
View File

@ -105,6 +105,7 @@ void sendMetadataToAudioOutput(AudioOutput * audioOutput, MpdTag * tag);
void printAllOutputPluginTypes(FILE * fp); void printAllOutputPluginTypes(FILE * fp);
extern AudioOutputPlugin shoutPlugin;
extern AudioOutputPlugin nullPlugin; extern AudioOutputPlugin nullPlugin;
extern AudioOutputPlugin alsaPlugin; extern AudioOutputPlugin alsaPlugin;
extern AudioOutputPlugin aoPlugin; extern AudioOutputPlugin aoPlugin;
@ -113,6 +114,5 @@ extern AudioOutputPlugin osxPlugin;
extern AudioOutputPlugin pulsePlugin; extern AudioOutputPlugin pulsePlugin;
extern AudioOutputPlugin mvpPlugin; extern AudioOutputPlugin mvpPlugin;
extern AudioOutputPlugin jackPlugin; extern AudioOutputPlugin jackPlugin;
extern AudioOutputPlugin shoutPlugin;
#endif #endif