summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-08-15 13:15:51 +0000
committerLennart Poettering <lennart@poettering.net>2004-08-15 13:15:51 +0000
commitefc3491f1f1ca42cd776f96ccfb006c53717d2e8 (patch)
treea55f3d43bd4b3cb4063ab870bcc224fba8a05454
parentc17545108b33162fb186f797b8a408511e9252f4 (diff)
add support for volume manipulation
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@125 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--polyp/cli-command.c2
-rw-r--r--polyp/pdispatch.c9
-rw-r--r--polyp/protocol-native.c46
-rw-r--r--polyp/sample.h5
-rw-r--r--polyp/sink-input.c9
-rw-r--r--polyp/sink-input.h2
-rw-r--r--polyp/sink.c3
7 files changed, 70 insertions, 6 deletions
diff --git a/polyp/cli-command.c b/polyp/cli-command.c
index 1d454f2a..aa61b10e 100644
--- a/polyp/cli-command.c
+++ b/polyp/cli-command.c
@@ -338,7 +338,7 @@ static int pa_cli_command_sink_input_volume(struct pa_core *c, struct pa_tokeniz
return -1;
}
- si->volume = (uint32_t) volume;
+ pa_sink_input_set_volume(si, (uint32_t) volume);
return 0;
}
diff --git a/polyp/pdispatch.c b/polyp/pdispatch.c
index 9ed91fc5..c46d4f77 100644
--- a/polyp/pdispatch.c
+++ b/polyp/pdispatch.c
@@ -175,13 +175,14 @@ int pa_pdispatch_run(struct pa_pdispatch *pd, struct pa_packet*packet, void *use
if (r)
run_action(pd, r, command, ts);
- } else if (pd->command_table && command < pd->n_commands) {
+ } else if (pd->command_table && (command < pd->n_commands) && pd->command_table[command].proc) {
const struct pa_pdispatch_command *c = pd->command_table+command;
- if (c->proc)
- c->proc(pd, command, tag, ts, userdata);
- } else
+ c->proc(pd, command, tag, ts, userdata);
+ } else {
+ fprintf(stderr, "Recieved unsupported command %u\n", command);
goto finish;
+ }
ret = 0;
diff --git a/polyp/protocol-native.c b/polyp/protocol-native.c
index 0d265e33..7df39fe3 100644
--- a/polyp/protocol-native.c
+++ b/polyp/protocol-native.c
@@ -134,6 +134,7 @@ static void command_get_info(struct pa_pdispatch *pd, uint32_t command, uint32_t
static void command_get_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_get_server_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static void command_subscribe(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
+static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
static const struct pa_pdispatch_command command_table[PA_COMMAND_MAX] = {
[PA_COMMAND_ERROR] = { NULL },
@@ -167,6 +168,7 @@ static const struct pa_pdispatch_command command_table[PA_COMMAND_MAX] = {
[PA_COMMAND_GET_CLIENT_INFO_LIST] = { command_get_info_list },
[PA_COMMAND_GET_SERVER_INFO] = { command_get_server_info },
[PA_COMMAND_SUBSCRIBE] = { command_subscribe },
+ [PA_COMMAND_SET_SINK_VOLUME] = { command_set_volume },
};
/* structure management */
@@ -1164,9 +1166,53 @@ static void command_subscribe(struct pa_pdispatch *pd, uint32_t command, uint32_
c->subscription = NULL;
pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
+static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+ struct connection *c = userdata;
+ uint32_t index, volume;
+ struct pa_sink *sink = NULL;
+ struct pa_sink_input *si = NULL;
+ const char *name = NULL;
+ assert(c && t);
+
+ if (pa_tagstruct_getu32(t, &index) < 0 ||
+ (command == PA_COMMAND_SET_SINK_VOLUME && pa_tagstruct_gets(t, &name) < 0) ||
+ pa_tagstruct_getu32(t, &volume) ||
+ !pa_tagstruct_eof(t)) {
+ protocol_error(c);
+ return;
+ }
+ if (!c->authorized) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_ACCESS);
+ return;
+ }
+
+ if (command == PA_COMMAND_SET_SINK_VOLUME) {
+ if (index != (uint32_t) -1)
+ sink = pa_idxset_get_by_index(c->protocol->core->sinks, index);
+ else
+ sink = pa_namereg_get(c->protocol->core, *name ? name : NULL, PA_NAMEREG_SINK, 1);
+ } else {
+ assert(command == PA_COMMAND_SET_SINK_INPUT_VOLUME);
+ si = pa_idxset_get_by_index(c->protocol->core->sinks, index);
+ }
+
+ if (!si && !sink) {
+ pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
+ return;
+ }
+
+ if (sink)
+ pa_sink_set_volume(sink, volume);
+ else if (si)
+ pa_sink_input_set_volume(si, volume);
+
+ pa_pstream_send_simple_ack(c->pstream, tag);
}
+
/*** pstream callbacks ***/
static void pstream_packet_callback(struct pa_pstream *p, struct pa_packet *packet, void *userdata) {
diff --git a/polyp/sample.h b/polyp/sample.h
index a7cde093..e397a1df 100644
--- a/polyp/sample.h
+++ b/polyp/sample.h
@@ -65,8 +65,13 @@ int pa_sample_spec_equal(const struct pa_sample_spec*a, const struct pa_sample_s
#define PA_SAMPLE_SNPRINT_MAX_LENGTH 32
void pa_sample_snprint(char *s, size_t l, const struct pa_sample_spec *spec);
+/** Normal volume (100%) */
#define PA_VOLUME_NORM (0x100)
+
+/** Muted volume (0%) */
#define PA_VOLUME_MUTE (0)
+
+/** Multiply two volumes specifications, return the result. This uses PA_VOLUME_NORM as neutral element of multiplication. */
uint32_t pa_volume_multiply(uint32_t a, uint32_t b);
PA_C_DECL_END
diff --git a/polyp/sink-input.c b/polyp/sink-input.c
index dd7469e0..cf255a07 100644
--- a/polyp/sink-input.c
+++ b/polyp/sink-input.c
@@ -168,3 +168,12 @@ void pa_sink_input_drop(struct pa_sink_input *i, size_t length) {
i->resampled_chunk.index = i->resampled_chunk.length = 0;
}
}
+
+void pa_sink_input_set_volume(struct pa_sink_input *i, uint32_t volume) {
+ assert(i);
+
+ if (i->volume != volume) {
+ i->volume = volume;
+ pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
+ }
+}
diff --git a/polyp/sink-input.h b/polyp/sink-input.h
index 63dce71d..b21dbf4d 100644
--- a/polyp/sink-input.h
+++ b/polyp/sink-input.h
@@ -64,4 +64,6 @@ uint32_t pa_sink_input_get_latency(struct pa_sink_input *i);
int pa_sink_input_peek(struct pa_sink_input *i, struct pa_memchunk *chunk);
void pa_sink_input_drop(struct pa_sink_input *i, size_t length);
+void pa_sink_input_set_volume(struct pa_sink_input *i, uint32_t volume);
+
#endif
diff --git a/polyp/sink.c b/polyp/sink.c
index d9a3ae86..b8617ae1 100644
--- a/polyp/sink.c
+++ b/polyp/sink.c
@@ -285,8 +285,9 @@ void pa_sink_set_owner(struct pa_sink *sink, struct pa_module *m) {
void pa_sink_set_volume(struct pa_sink *sink, uint32_t volume) {
assert(sink);
+
if (sink->volume != volume) {
- pa_subscription_post(sink->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, sink->index);
sink->volume = volume;
+ pa_subscription_post(sink->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, sink->index);
}
}