add noop implementation of standby/resume ESOUND commands

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@230 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/polyp/esdcompat.sh.in b/polyp/esdcompat.sh.in
index 32f8d8642489cbedef0a4af8f707cd2e213c946b..8b9cbf94278e63af29c0cf6227ad51c37de9077b 100755 (executable)
--- a/polyp/esdcompat.sh.in
+++ b/polyp/esdcompat.sh.in
@@ -22,7 +22,7 @@
 VERSION_STRING="@PACKAGE_NAME@ esd wrapper @PACKAGE_VERSION@"
 
 fail() {
-    echo "$1" > /dev/stderr
+    echo "ERROR: $1"
     exit 1
 }
 

diff --git a/polyp/protocol-esound.c b/polyp/protocol-esound.c
index 690083647195a4cb96133a6bba9c8353a27d24ce..ccbc61be14980d66e5c5ea54358a1ecce3709b10 100644 (file)
--- a/polyp/protocol-esound.c
+++ b/polyp/protocol-esound.c
@@ -122,6 +122,7 @@ static int esd_proto_stream_pan(struct connection *c, esd_proto_t request, const
 static int esd_proto_sample_cache(struct connection *c, esd_proto_t request, const void *data, size_t length);
 static int esd_proto_sample_free_or_play(struct connection *c, esd_proto_t request, const void *data, size_t length);
 static int esd_proto_sample_get_id(struct connection *c, esd_proto_t request, const void *data, size_t length);
+static int esd_proto_noop(struct connection *c, esd_proto_t request, const void *data, size_t length);
 
 /* the big map of protocol handler info */
 static struct proto_handler proto_map[ESD_PROTO_MAX] = {
@@ -140,8 +141,8 @@ static struct proto_handler proto_map[ESD_PROTO_MAX] = {
     { sizeof(int),                    NULL, "sample stop" },
     { -1,                             NULL, "TODO: sample kill" },
 
-    { ESD_KEY_LEN + sizeof(int),      NULL, "standby" },
-    { ESD_KEY_LEN + sizeof(int),      NULL, "resume" },
+    { ESD_KEY_LEN + sizeof(int),      esd_proto_noop, "standby" },  /* NOOP! */
+    { ESD_KEY_LEN + sizeof(int),      esd_proto_noop, "resume" },   /* NOOP! */
 
     { ESD_NAME_MAX,                   esd_proto_sample_get_id, "sample getid" },
     { ESD_NAME_MAX + 2 * sizeof(int), NULL, "stream filter" },
@@ -654,6 +655,14 @@ static int esd_proto_sample_free_or_play(struct connection *c, esd_proto_t reque
     return 0;
 }
 
+static int esd_proto_noop(struct connection *c, esd_proto_t request, const void *data, size_t length) {
+    int *ok;
+    ok = connection_write(c, sizeof(int));
+    assert(ok);
+    *ok = 1;
+    return 0;
+}
+
 /*** client callbacks ***/
 
 static void client_kill_cb(struct pa_client *c) {