From 674b4ab64735dac3b8113e09db4cdb9072ddacb7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 2 Oct 2012 00:08:06 +0200 Subject: output/shout: eliminate struct shout_buffer Move the raw buffer to struct shout_data. --- src/output/shout_output_plugin.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/output/shout_output_plugin.c b/src/output/shout_output_plugin.c index 1b5922e98..63f1001ba 100644 --- a/src/output/shout_output_plugin.c +++ b/src/output/shout_output_plugin.c @@ -36,10 +36,6 @@ #define DEFAULT_CONN_TIMEOUT 2 -struct shout_buffer { - unsigned char data[32768]; -}; - struct shout_data { struct audio_output base; @@ -53,7 +49,7 @@ struct shout_data { int timeout; - struct shout_buffer buf; + uint8_t buffer[32768]; }; static int shout_init_count; @@ -347,11 +343,11 @@ write_page(struct shout_data *sd, GError **error) assert(sd->encoder != NULL); size_t nbytes = encoder_read(sd->encoder, - sd->buf.data, sizeof(sd->buf.data)); + sd->buffer, sizeof(sd->buffer)); if (nbytes == 0) return true; - int err = shout_send(sd->shout_conn, sd->buf.data, nbytes); + int err = shout_send(sd->shout_conn, sd->buffer, nbytes); if (!handle_shout_error(sd, err, error)) return false; -- cgit v1.2.3