diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-09-21 19:00:03 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-09-21 19:00:03 +0000 |
| commit | 3e1bdacd4fcd3779141c53008b983fe78e639b30 (patch) | |
| tree | d7a89644e682a9711d36fdfa507ceaeb350d8840 | |
| parent | df953a11c98d6b8213aa66c6433340d9bb7927f3 (diff) | |
add noop implementation of standby/resume ESOUND commands
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@230 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rwxr-xr-x | polyp/esdcompat.sh.in | 2 | ||||
| -rw-r--r-- | polyp/protocol-esound.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/polyp/esdcompat.sh.in b/polyp/esdcompat.sh.in index 32f8d864..8b9cbf94 100755 --- 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 69008364..ccbc61be 100644 --- 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) { |