aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs/audioOutput_shout.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-12 15:59:55 +0200
committerMax Kellermann <max@duempel.org>2008-09-12 15:59:55 +0200
commit1333c392444fad9dc23f4d7a07c39fd275e72e4e (patch)
treed0c3cba11f78ede0d263d446bb2aae46392b332b /src/audioOutputs/audioOutput_shout.h
parentf482f83eb893314dbfe84ec04b017c7c469d8ca3 (diff)
downloadmpd-1333c392444fad9dc23f4d7a07c39fd275e72e4e.tar.gz
mpd-1333c392444fad9dc23f4d7a07c39fd275e72e4e.tar.xz
mpd-1333c392444fad9dc23f4d7a07c39fd275e72e4e.zip
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.
Diffstat (limited to 'src/audioOutputs/audioOutput_shout.h')
-rw-r--r--src/audioOutputs/audioOutput_shout.h12
1 files changed, 8 insertions, 4 deletions
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;