shout: moved declarations to audioOutput_shout.h

Prepare the split of the shout plugin into multiple sources: move
all important declarations to audioOutput_shout.h.

3 files changed, 70 insertions, 40 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index fb1508d43..ee20c593f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,7 @@ mpd_headers = \
 	output_api.h \
 	output_list.h \
 	output_control.h \
+	audioOutputs/audioOutput_shout.h \
 	buffer2array.h \
 	charConv.h \
 	command.h \
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index ec33f8f94..b75e3ab7e 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -16,56 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../output_api.h"
+#include "audioOutput_shout.h"
 
 #ifdef HAVE_SHOUT
 
 #include "../utils.h"
-#include "../log.h"
-#include "../timer.h"
-
-#include <shout/shout.h>
-#include <vorbis/vorbisenc.h>
 
 #define CONN_ATTEMPT_INTERVAL 60
 #define DEFAULT_CONN_TIMEOUT  2
 
 static int shout_init_count;
 
-struct shout_data {
-	shout_t *shout_conn;
-	int shout_error;
-
-	ogg_stream_state os;
-	ogg_page og;
-	ogg_packet op;
-	ogg_packet header_main;
-	ogg_packet header_comments;
-	ogg_packet header_codebooks;
-
-	vorbis_dsp_state vd;
-	vorbis_block vb;
-	vorbis_info vi;
-	vorbis_comment vc;
-
-	float quality;
-	int bitrate;
-
-	int opened;
-
-	struct tag *tag;
-	int tag_to_send;
-
-	int timeout;
-	int conn_attempts;
-	time_t last_attempt;
-
-	Timer *timer;
-
-	/* the configured audio format */
-	struct audio_format audio_format;
-};
-
 static struct shout_data *new_shout_data(void)
 {
 	struct shout_data *ret = xmalloc(sizeof(*ret));
diff --git a/src/audioOutputs/audioOutput_shout.h b/src/audioOutputs/audioOutput_shout.h
new file mode 100644
index 000000000..f34ca2686
--- /dev/null
+++ b/src/audioOutputs/audioOutput_shout.h
@@ -0,0 +1,68 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: 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
+ */
+
+#ifndef AUDIO_OUTPUT_SHOUT_H
+#define AUDIO_OUTPUT_SHOUT_H
+
+#include "../output_api.h"
+
+#ifdef HAVE_SHOUT
+
+#include "../conf.h"
+#include "../timer.h"
+
+#include <shout/shout.h>
+#include <vorbis/vorbisenc.h>
+
+struct shout_data {
+	shout_t *shout_conn;
+	int shout_error;
+
+	ogg_stream_state os;
+	ogg_page og;
+	ogg_packet op;
+	ogg_packet header_main;
+	ogg_packet header_comments;
+	ogg_packet header_codebooks;
+
+	vorbis_dsp_state vd;
+	vorbis_block vb;
+	vorbis_info vi;
+	vorbis_comment vc;
+
+	float quality;
+	int bitrate;
+
+	int opened;
+
+	struct tag *tag;
+	int tag_to_send;
+
+	int timeout;
+	int conn_attempts;
+	time_t last_attempt;
+
+	Timer *timer;
+
+	/* the configured audio format */
+	struct audio_format audio_format;
+};
+
+#endif
+
+#endif