diff options
author | Max Kellermann <max@duempel.org> | 2009-08-15 21:18:38 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-08-15 21:18:38 +0200 |
commit | f401c1059c78358b701dbee22ca78035c6e652eb (patch) | |
tree | 5cf487eea76b70b91e6acee8f55b6ca135b45a4a /src/output | |
parent | e28a0e97b5d2e54684c6452d6d45f64ff1e542d9 (diff) | |
parent | 5715534b530cfed0d6650b0fb34cfcb17da4088b (diff) | |
download | mpd-f401c1059c78358b701dbee22ca78035c6e652eb.tar.gz mpd-f401c1059c78358b701dbee22ca78035c6e652eb.tar.xz mpd-f401c1059c78358b701dbee22ca78035c6e652eb.zip |
Merged release 0.15.2 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/output')
-rw-r--r-- | src/output/shout_plugin.c | 7 |
1 files changed, 7 insertions, 0 deletions
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); } |