summaryrefslogtreecommitdiff
path: root/src/audio.c
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2006-07-16 14:57:26 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2006-07-16 14:57:26 +0000
commitb38157fc762537329fad36a63a105d15840470e0 (patch)
tree78538529510977a081757070e508ebd0a0b1d8b0 /src/audio.c
parent5070f8bc7870c1e65570849a29f5779741555f7c (diff)
Committing qball's patch to list supported audio outputs in --version
git-svn-id: https://svn.musicpd.org/mpd/trunk@4357 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audio.c')
-rw-r--r--src/audio.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/audio.c b/src/audio.c
index da2a20c80..6766159b2 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -79,11 +79,8 @@ extern AudioOutputPlugin pulsePlugin;
extern AudioOutputPlugin mvpPlugin;
extern AudioOutputPlugin shoutPlugin;
-/* make sure initPlayerData is called before this function!! */
-void initAudioDriver() {
- ConfigParam * param = NULL;
- int i;
+void loadAudioDrivers() {
initAudioOutputPlugins();
loadAudioOutputPlugin(&alsaPlugin);
loadAudioOutputPlugin(&aoPlugin);
@@ -92,6 +89,14 @@ void initAudioDriver() {
loadAudioOutputPlugin(&pulsePlugin);
loadAudioOutputPlugin(&mvpPlugin);
loadAudioOutputPlugin(&shoutPlugin);
+}
+
+/* make sure initPlayerData is called before this function!! */
+void initAudioDriver() {
+ ConfigParam * param = NULL;
+ int i;
+
+ loadAudioDrivers();
pdAudioDevicesEnabled = (getPlayerData())->audioDeviceEnabled;