audio: moved state file code to output_state.c

6 files changed, 121 insertions, 59 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 27b2f2355..4888bfa27 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,6 +41,7 @@ mpd_headers = \
 	output_list.h \
 	output_thread.h \
 	output_control.h \
+	output_state.h \
 	output/shout_plugin.h \
 	buffer2array.h \
 	command.h \
@@ -138,6 +139,7 @@ mpd_SOURCES = \
 	output_list.c \
 	output_thread.c \
 	output_control.c \
+	output_state.c \
 	output_init.c \
 	output/null_plugin.c \
 	buffer2array.c \
diff --git a/src/audio.c b/src/audio.c
index e048a0b6f..ef62ef958 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -31,9 +31,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#define AUDIO_DEVICE_STATE	"audio_device_state:"
-#define AUDIO_BUFFER_SIZE	2*MPD_PATH_MAX
-
 static struct audio_format configured_audio_format;
 static struct audio_format input_audio_format;
 
@@ -399,56 +396,6 @@ void printAudioDevices(struct client *client)
 	}
 }
 
-void saveAudioDevicesState(FILE *fp)
-{
-	unsigned int i;
-
-	assert(audioOutputArraySize != 0);
-	for (i = 0; i < audioOutputArraySize; i++) {
-		fprintf(fp, AUDIO_DEVICE_STATE "%d:%s\n",
-			audioOutputArray[i].enabled,
-		        audioOutputArray[i].name);
-	}
-}
-
-void readAudioDevicesState(FILE *fp)
-{
-	char buffer[AUDIO_BUFFER_SIZE];
-	unsigned int i;
-
-	assert(audioOutputArraySize != 0);
-
-	while (fgets(buffer, sizeof(buffer), fp)) {
-		char *c, *name;
-
-		g_strchomp(buffer);
-
-		if (!g_str_has_prefix(buffer, AUDIO_DEVICE_STATE))
-			continue;
-
-		c = strchr(buffer, ':');
-		if (!c || !(++c))
-			goto errline;
-
-		name = strchr(c, ':');
-		if (!name || !(++name))
-			goto errline;
-
-		for (i = 0; i < audioOutputArraySize; ++i) {
-			if (!strcmp(name, audioOutputArray[i].name)) {
-				/* devices default to on */
-				if (!atoi(c))
-					audioOutputArray[i].enabled = false;
-				break;
-			}
-		}
-		continue;
-errline:
-		/* nonfatal */
-		g_warning("invalid line in state_file: %s\n", buffer);
-	}
-}
-
 bool mixer_control_setvol(unsigned int device, int volume, int rel)
 {
 	struct audio_output *output;
diff --git a/src/audio.h b/src/audio.h
index 2dd71732b..063a02b05 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -20,7 +20,7 @@
 #define MPD_AUDIO_H
 
 #include <stdbool.h>
-#include <stdio.h>
+#include <stddef.h>
 
 #define AUDIO_AO_DRIVER_DEFAULT	"default"
 
@@ -82,10 +82,6 @@ int disableAudioDevice(unsigned int device);
 
 void printAudioDevices(struct client *client);
 
-void readAudioDevicesState(FILE *fp);
-
-void saveAudioDevicesState(FILE *fp);
-
 bool mixer_control_setvol(unsigned int device, int volume, int rel);
 bool mixer_control_getvol(unsigned int device, int *volume);
 
diff --git a/src/output_state.c b/src/output_state.c
new file mode 100644
index 000000000..d0a2baeff
--- /dev/null
+++ b/src/output_state.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ * Saving and loading the audio output states to/from the state file.
+ *
+ */
+
+#include "output_state.h"
+#include "output_internal.h"
+#include "audio.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#define AUDIO_DEVICE_STATE "audio_device_state:"
+
+void
+saveAudioDevicesState(FILE *fp)
+{
+	unsigned n = audio_output_count();
+
+	assert(n > 0);
+
+	for (unsigned i = 0; i < n; ++i) {
+		const struct audio_output *ao = audio_output_get(i);
+
+		fprintf(fp, AUDIO_DEVICE_STATE "%d:%s\n",
+			ao->enabled, ao->name);
+	}
+}
+
+void
+readAudioDevicesState(FILE *fp)
+{
+	char buffer[1024];
+
+	while (fgets(buffer, sizeof(buffer), fp)) {
+		char *c, *name;
+		struct audio_output *ao;
+
+		g_strchomp(buffer);
+
+		if (!g_str_has_prefix(buffer, AUDIO_DEVICE_STATE))
+			continue;
+
+		c = strchr(buffer, ':');
+		if (!c || !(++c))
+			goto errline;
+
+		name = strchr(c, ':');
+		if (!name || !(++name))
+			goto errline;
+
+		ao = audio_output_find(name);
+		if (ao != NULL && atoi(c) == 0)
+			ao->enabled = false;
+
+		continue;
+errline:
+		/* nonfatal */
+		g_warning("invalid line in state_file: %s\n", buffer);
+	}
+}
diff --git a/src/output_state.h b/src/output_state.h
new file mode 100644
index 000000000..29eb123ad
--- /dev/null
+++ b/src/output_state.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ * Saving and loading the audio output states to/from the state file.
+ *
+ */
+
+#ifndef OUTPUT_STATE_H
+#define OUTPUT_STATE_H
+
+#include <stdio.h>
+
+void
+readAudioDevicesState(FILE *fp);
+
+void
+saveAudioDevicesState(FILE *fp);
+
+#endif
diff --git a/src/state_file.c b/src/state_file.c
index 64fd67c4c..6aa97d572 100644
--- a/src/state_file.c
+++ b/src/state_file.c
@@ -17,7 +17,7 @@
  */
 
 #include "state_file.h"
-#include "audio.h"
+#include "output_state.h"
 #include "playlist.h"
 #include "volume.h"