aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-07-20 20:54:34 +0200
committerMax Kellermann <max@duempel.org>2011-07-20 20:54:34 +0200
commit838f7cd210dbd3f071d48d54c168c123c3d20c58 (patch)
tree7ded7d68cbd7130b542094f08b50c4e10972a075 /src/output
parent13539961b25940ca6d28c28ab7972c244681e3b5 (diff)
downloadmpd-838f7cd210dbd3f071d48d54c168c123c3d20c58.tar.gz
mpd-838f7cd210dbd3f071d48d54c168c123c3d20c58.tar.xz
mpd-838f7cd210dbd3f071d48d54c168c123c3d20c58.zip
encoder_plugin: add method pre_tag()
In the "vorbis" plugin, this is a copy of the old flush() method, while flush() gets a lot of code remove, it just sets the "flush" flag and nothing else. It doesn't start a new stream now, which should fix a few problems in some players.
Diffstat (limited to '')
-rw-r--r--src/output/httpd_output_plugin.c2
-rw-r--r--src/output/shout_plugin.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c
index 0137965a6..40ad05c3d 100644
--- a/src/output/httpd_output_plugin.c
+++ b/src/output/httpd_output_plugin.c
@@ -523,7 +523,7 @@ httpd_output_tag(void *data, const struct tag *tag)
/* flush the current stream, and end it */
- encoder_flush(httpd->encoder, NULL);
+ encoder_pre_tag(httpd->encoder, NULL);
httpd_output_encoder_to_clients(httpd);
/* send the tag to the encoder - which starts a new
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 5e1ef762a..35efd9fc7 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -511,7 +511,7 @@ static void my_shout_set_tag(void *data,
if (sd->encoder->plugin->tag != NULL) {
/* encoder plugin supports stream tags */
- ret = encoder_flush(sd->encoder, &error);
+ ret = encoder_pre_tag(sd->encoder, &error);
if (!ret) {
g_warning("%s", error->message);
g_error_free(error);