aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-08-14 11:52:36 +0200
committerMax Kellermann <max@duempel.org>2009-08-14 11:52:36 +0200
commitf38ce5408b5d0126b8cfe730c91d5203ee59a987 (patch)
tree1caecaa642051b5cd7820471aecde19f3da97e42
parent7133f560ec24c90671a40c9f9bc9cea6eb31cc17 (diff)
downloadmpd-f38ce5408b5d0126b8cfe730c91d5203ee59a987.tar.gz
mpd-f38ce5408b5d0126b8cfe730c91d5203ee59a987.tar.xz
mpd-f38ce5408b5d0126b8cfe730c91d5203ee59a987.zip
output/shout: minimize the unpause latency
During the pause loop, manually sleep for 500ms if shout_delay() returns a value greater than that. Don't exhaust libshout's buffer.
-rw-r--r--NEWS1
-rw-r--r--src/output/shout_plugin.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e0f6a433d..4442c70ef 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ ver 0.15.2 (2009/??/??)
- flac: don't allocate cuesheet twice (memleak)
* output:
- shout: fixed stuck pause bug
+ - shout: minimize the unpause latency
* update: free empty path string (memleak)
* update: free temporary string in container scan (memleak)
* directory: free empty directories after removing them (memleak)
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 8e091679e..4412d26ff 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -448,8 +448,15 @@ my_shout_play(void *data, const void *chunk, size_t size, GError **error)
static bool
my_shout_pause(void *data)
{
+ struct shout_data *sd = (struct shout_data *)data;
static const char silence[1020];
+ if (shout_delay(sd->shout_conn) > 500) {
+ /* cap the latency for unpause */
+ g_usleep(500000);
+ return true;
+ }
+
return my_shout_play(data, silence, sizeof(silence), NULL);
}