aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-08-06 07:23:17 +0200
committerMax Kellermann <max@duempel.org>2010-08-31 06:50:14 +0200
commit917434269c102d98ce45eb89964c322c3c2041c8 (patch)
tree3a209cb4702aaf4b06c8c12362908c672e92fb69
parenta77506ae215df09ed02c30f39a3be663a3180d5b (diff)
downloadmpd-917434269c102d98ce45eb89964c322c3c2041c8.tar.gz
mpd-917434269c102d98ce45eb89964c322c3c2041c8.tar.xz
mpd-917434269c102d98ce45eb89964c322c3c2041c8.zip
output/httpd: implement "pause"
Send silence to all connected clients while paused, to avoid connection interruption.
-rw-r--r--NEWS1
-rw-r--r--src/output/httpd_output_plugin.c19
2 files changed, 20 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 007da6305..f40befed9 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ ver 0.16 (20??/??/??)
- jack: support more than two audio channels
- httpd: bind port when output is enabled
- httpd: added name/genre/website configuration
+ - httpd: implement "pause"
- oss: 24 bit support via OSS4
- win32: new output plugin for Windows Wave
- wildcards allowed in audio_format configuration
diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c
index a71e21604..51ae820bc 100644
--- a/src/output/httpd_output_plugin.c
+++ b/src/output/httpd_output_plugin.c
@@ -499,6 +499,24 @@ httpd_output_play(void *data, const void *chunk, size_t size, GError **error)
return size;
}
+static bool
+httpd_output_pause(void *data)
+{
+ struct httpd_output *httpd = data;
+
+ g_mutex_lock(httpd->mutex);
+ bool has_clients = httpd->clients != NULL;
+ g_mutex_unlock(httpd->mutex);
+
+ if (has_clients) {
+ static const char silence[1020];
+ return httpd_output_play(data, silence, sizeof(silence), NULL);
+ } else {
+ g_usleep(100000);
+ return true;
+ }
+}
+
static void
httpd_send_metadata(gpointer data, gpointer user_data)
{
@@ -587,5 +605,6 @@ const struct audio_output_plugin httpd_output_plugin = {
.close = httpd_output_close,
.send_tag = httpd_output_tag,
.play = httpd_output_play,
+ .pause = httpd_output_pause,
.cancel = httpd_output_cancel,
};