From 1333c392444fad9dc23f4d7a07c39fd275e72e4e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 12 Sep 2008 15:59:55 +0200
Subject: shout: added struct _ogg_vorbis_data

Preparing the merge of Eric Wollesen's patch "Refactor and cleanup of
shout Ogg and MP3 audio outputs": we declare one of the struct types
here, to make the merge smoother.
---
 src/audioOutputs/audioOutput_shout.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/audioOutputs/audioOutput_shout.h')

diff --git a/src/audioOutputs/audioOutput_shout.h b/src/audioOutputs/audioOutput_shout.h
index f145d7566..295a7e14f 100644
--- a/src/audioOutputs/audioOutput_shout.h
+++ b/src/audioOutputs/audioOutput_shout.h
@@ -35,10 +35,7 @@ typedef struct _shout_buffer {
 	size_t max_len;
 } shout_buffer;
 
-struct shout_data {
-	shout_t *shout_conn;
-	int shout_error;
-
+typedef struct _ogg_vorbis_data {
 	ogg_stream_state os;
 	ogg_page og;
 	ogg_packet op;
@@ -50,6 +47,13 @@ struct shout_data {
 	vorbis_block vb;
 	vorbis_info vi;
 	vorbis_comment vc;
+} ogg_vorbis_data;
+
+struct shout_data {
+	shout_t *shout_conn;
+	int shout_error;
+
+	ogg_vorbis_data od;
 
 	float quality;
 	int bitrate;
-- 
cgit v1.2.3