Skip to content

M
mpd
Commit 674b4ab6 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/shout: eliminate struct shout_buffer

Move the raw buffer to struct shout_data.
parent fe8fc108
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
src/output/shout_output_plugin.c
View file @ 674b4ab6
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
#define DEFAULT_CONN_TIMEOUT 2 #define DEFAULT_CONN_TIMEOUT 2
struct shout_buffer {
unsigned char data[32768];
};
struct shout_data { struct shout_data {
struct audio_output base; struct audio_output base;
...@@ -53,7 +49,7 @@ struct shout_data { ...@@ -53,7 +49,7 @@ struct shout_data {
int timeout; int timeout;
struct shout_buffer buf; uint8_t buffer[32768];
}; };
static int shout_init_count; static int shout_init_count;
...@@ -347,11 +343,11 @@ write_page(struct shout_data *sd, GError **error) ...@@ -347,11 +343,11 @@ write_page(struct shout_data *sd, GError **error)
assert(sd->encoder != NULL); assert(sd->encoder != NULL);
size_t nbytes = encoder_read(sd->encoder, size_t nbytes = encoder_read(sd->encoder,
sd->buf.data, sizeof(sd->buf.data)); sd->buffer, sizeof(sd->buffer));
if (nbytes == 0) if (nbytes == 0)
return true; 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)) if (!handle_shout_error(sd, err, error))
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment