aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs/audioOutput_shout.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-12 14:59:53 +0200
committerMax Kellermann <max@duempel.org>2008-09-12 14:59:53 +0200
commit7d3ca9c1ffa25c8fd8b53714fa67e140ae655381 (patch)
treefa9a60826c6f3b21ccb75218e38c6383b0114e27 /src/audioOutputs/audioOutput_shout.c
parentb0884ddd81eb2bbac1134d03cf929a592494fc66 (diff)
downloadmpd-7d3ca9c1ffa25c8fd8b53714fa67e140ae655381.tar.gz
mpd-7d3ca9c1ffa25c8fd8b53714fa67e140ae655381.tar.xz
mpd-7d3ca9c1ffa25c8fd8b53714fa67e140ae655381.zip
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.
Diffstat (limited to 'src/audioOutputs/audioOutput_shout.c')
-rw-r--r--src/audioOutputs/audioOutput_shout.c41
1 files changed, 1 insertions, 40 deletions
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));