diff options
author | Max Kellermann <max@duempel.org> | 2009-02-10 17:21:10 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-02-10 17:21:10 +0100 |
commit | 3e87033145fc090f147d17b0bde1bc5e0e61baab (patch) | |
tree | cb2cf1e4d561de83d63cbb5cb108914beba0ca5b | |
parent | ff09a4180769c24d06e0c0e707193d353415887d (diff) | |
download | mpd-3e87033145fc090f147d17b0bde1bc5e0e61baab.tar.gz mpd-3e87033145fc090f147d17b0bde1bc5e0e61baab.tar.xz mpd-3e87033145fc090f147d17b0bde1bc5e0e61baab.zip |
audio: added audio_output_config_count()
audio_output_config_count() returns the number of audio outputs in the
configuration file. It is only used by initAudioDriver(). The public
function audio_output_count() now returns audioOutputArraySize.
-rw-r--r-- | src/audio.c | 8 | ||||
-rw-r--r-- | src/audio.h | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/audio.c b/src/audio.c index a4445ac54..7f51a31d9 100644 --- a/src/audio.c +++ b/src/audio.c @@ -42,6 +42,12 @@ static unsigned int audioOutputArraySize; unsigned int audio_output_count(void) { + return audioOutputArraySize; +} + +static unsigned +audio_output_config_count(void) +{ unsigned int nr = 0; const struct config_param *param = NULL; @@ -60,7 +66,7 @@ void initAudioDriver(void) notify_init(&audio_output_client_notify); - audioOutputArraySize = audio_output_count(); + audioOutputArraySize = audio_output_config_count(); audioOutputArray = g_new(struct audio_output, audioOutputArraySize); for (i = 0; i < audioOutputArraySize; i++) diff --git a/src/audio.h b/src/audio.h index c20f74f54..c42d27d5e 100644 --- a/src/audio.h +++ b/src/audio.h @@ -29,6 +29,10 @@ struct tag; struct client; struct config_param; +/** + * Returns the total number of audio output devices, including those + * who are disabled right now. + */ unsigned int audio_output_count(void); void getOutputAudioFormat(const struct audio_format *inFormat, |