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.

audio: added audio_output_config_count()
3e870331 · Max Kellermann · ff09a418 · 3e870331 · 3e870331
Commit 3e870331 authored Feb 10, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

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

audio.h src/audio.h +4 -0

No files found.
--- 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++)

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