aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-09 16:35:51 +0100
committerMax Kellermann <max@duempel.org>2009-02-09 16:37:16 +0100
commitcf94008b27620f7bfa87ce0c986806c35f7911bb (patch)
tree094cb73b713e06362162fd5a7847297d1a274c9a
parent044f2561ce6814f05375ea073e8ca39a5124bc5a (diff)
downloadmpd-cf94008b27620f7bfa87ce0c986806c35f7911bb.tar.gz
mpd-cf94008b27620f7bfa87ce0c986806c35f7911bb.tar.xz
mpd-cf94008b27620f7bfa87ce0c986806c35f7911bb.zip
shout: removed shout_data.tag_to_send
When shout_data.tag!=NULL, there is a "tag to send". The tag_to_send flag is redundant.
-rw-r--r--src/output/shout_plugin.c14
-rw-r--r--src/output/shout_plugin.h1
2 files changed, 6 insertions, 9 deletions
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 765ec2e9d..9f7e98e5e 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -58,7 +58,6 @@ static struct shout_data *new_shout_data(void)
ret->shout_meta = shout_metadata_new();
ret->opened = 0;
ret->tag = NULL;
- ret->tag_to_send = 0;
ret->bitrate = -1;
ret->quality = -2.0;
ret->timeout = DEFAULT_CONN_TIMEOUT;
@@ -428,7 +427,6 @@ static int open_shout_conn(void *data)
write_page(sd);
sd->opened = true;
- sd->tag_to_send = 1;
sd->conn_attempts = 0;
return 0;
@@ -455,7 +453,9 @@ static void send_metadata(struct shout_data * sd)
static const int size = 1024;
char song[size];
- if (!sd->opened || !sd->tag)
+ assert(sd->tag != NULL);
+
+ if (!sd->opened)
return;
if (sd->encoder->send_metadata_func(sd, song, size)) {
@@ -463,11 +463,11 @@ static void send_metadata(struct shout_data * sd)
if (SHOUTERR_SUCCESS != shout_set_metadata(sd->shout_conn,
sd->shout_meta)) {
g_warning("error setting shout metadata\n");
- return;
}
}
- sd->tag_to_send = 0;
+ tag_free(sd->tag);
+ sd->tag = NULL;
}
static bool
@@ -481,7 +481,7 @@ my_shout_play(void *data, const char *chunk, size_t size)
timer_add(sd->timer, size);
- if (sd->opened && sd->tag_to_send)
+ if (sd->opened && sd->tag != NULL)
send_metadata(sd);
if (!sd->opened) {
@@ -519,13 +519,11 @@ static void my_shout_set_tag(void *data,
if (sd->tag)
tag_free(sd->tag);
sd->tag = NULL;
- sd->tag_to_send = 0;
if (!tag)
return;
sd->tag = tag_dup(tag);
- sd->tag_to_send = 1;
}
const struct audio_output_plugin shoutPlugin = {
diff --git a/src/output/shout_plugin.h b/src/output/shout_plugin.h
index 86838abbb..7439283eb 100644
--- a/src/output/shout_plugin.h
+++ b/src/output/shout_plugin.h
@@ -71,7 +71,6 @@ struct shout_data {
bool opened;
struct tag *tag;
- int tag_to_send;
int timeout;
int conn_attempts;