aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-22 17:52:37 +0100
committerMax Kellermann <max@duempel.org>2009-02-22 17:52:37 +0100
commitd50a3d513eb0452e762f1e4eeb717318958cd83c (patch)
tree6574813149ee29cfa7b70a6529bd7f372ceb7a94 /src
parent1c56edd1c82727e463eb73be1027119edd17b33e (diff)
downloadmpd-d50a3d513eb0452e762f1e4eeb717318958cd83c.tar.gz
mpd-d50a3d513eb0452e762f1e4eeb717318958cd83c.tar.xz
mpd-d50a3d513eb0452e762f1e4eeb717318958cd83c.zip
shout: removed shout_plugin.h
There are no plugins left which require shout_plugin.h. Moved the struct declaration to shout_plugin.c.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/output/shout_plugin.c29
-rw-r--r--src/output/shout_plugin.h52
3 files changed, 28 insertions, 54 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 942bc5645..0183a669e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ mpd_headers = \
output_state.h \
output_print.h \
output_command.h \
- output/shout_plugin.h \
buffer2array.h \
command.h \
idle.h \
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index f4a488f6f..7887e2922 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -16,16 +16,43 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "shout_plugin.h"
+#include "output_api.h"
#include "encoder_plugin.h"
#include "encoder_list.h"
+#include <shout/shout.h>
+#include <glib.h>
+
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "shout"
+
#define DEFAULT_CONN_TIMEOUT 2
+struct shout_buffer {
+ unsigned char data[32768];
+ size_t len;
+};
+
+struct shout_data {
+ struct audio_output *audio_output;
+
+ shout_t *shout_conn;
+ shout_metadata_t *shout_meta;
+
+ struct encoder *encoder;
+
+ float quality;
+ int bitrate;
+
+ int timeout;
+
+ struct shout_buffer buf;
+};
+
static int shout_init_count;
static const struct encoder_plugin *
diff --git a/src/output/shout_plugin.h b/src/output/shout_plugin.h
deleted file mode 100644
index 4bc6dac90..000000000
--- a/src/output/shout_plugin.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* 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 MPD_SHOUT_PLUGIN_H
-#define MPD_SHOUT_PLUGIN_H
-
-#include "../output_api.h"
-#include "../conf.h"
-
-#include <shout/shout.h>
-#include <glib.h>
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "shout"
-
-struct shout_buffer {
- unsigned char data[32768];
- size_t len;
-};
-
-struct shout_data {
- struct audio_output *audio_output;
-
- shout_t *shout_conn;
- shout_metadata_t *shout_meta;
-
- struct encoder *encoder;
-
- float quality;
- int bitrate;
-
- int timeout;
-
- struct shout_buffer buf;
-};
-
-#endif