mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for volume manipulation

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@125 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-08-15 13:15:51 +00:00
parent c17545108b
commit efc3491f1f
7 changed files with 71 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
polyp/cli-command.c
View file

@ -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;
}

9
polyp/pdispatch.c
View file

@ -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;

48
polyp/protocol-native.c
View file

@ -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) {

5
polyp/sample.h
View file

@ -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

9
polyp/sink-input.c
View file

@ -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);
}
}

2
polyp/sink-input.h
View file

@ -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

3
polyp/sink.c
View file

@ -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);
}
}