X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/684b89c639e89cd411dad802c975fc5784951f3b..ef4ae785aa1d4d67b5df1c9414f6c1a144bc3460:/src/pulsecore/protocol-native.c diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index bb4be726..96df383d 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -45,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -61,6 +60,8 @@ #include "protocol-native.h" +/* #define PROTOCOL_NATIVE_DEBUG */ + /* Kick a client if it doesn't authenticate within this time */ #define AUTH_TIMEOUT (60 * PA_USEC_PER_SEC) @@ -83,9 +84,12 @@ typedef struct record_stream { pa_source_output *source_output; pa_memblockq *memblockq; - pa_bool_t adjust_latency:1; - pa_bool_t early_requests:1; + bool adjust_latency:1; + bool early_requests:1; + /* Requested buffer attributes */ + pa_buffer_attr buffer_attr_req; + /* Fixed-up and adjusted buffer attributes */ pa_buffer_attr buffer_attr; pa_atomic_t on_the_fly; @@ -117,11 +121,11 @@ typedef struct playback_stream { pa_sink_input *sink_input; pa_memblockq *memblockq; - pa_bool_t adjust_latency:1; - pa_bool_t early_requests:1; + bool adjust_latency:1; + bool early_requests:1; - pa_bool_t is_underrun:1; - pa_bool_t drain_request:1; + bool is_underrun:1; + bool drain_request:1; uint32_t drain_tag; uint32_t syncid; @@ -131,6 +135,9 @@ typedef struct playback_stream { pa_atomic_t missing; pa_usec_t configured_sink_latency; + /* Requested buffer attributes */ + pa_buffer_attr buffer_attr_req; + /* Fixed-up and adjusted buffer attributes */ pa_buffer_attr buffer_attr; /* Only updated after SINK_INPUT_MESSAGE_UPDATE_LATENCY */ @@ -164,8 +171,8 @@ struct pa_native_connection { pa_msgobject parent; pa_native_protocol *protocol; pa_native_options *options; - pa_bool_t authorized:1; - pa_bool_t is_local:1; + bool authorized:1; + bool is_local:1; uint32_t version; pa_client *client; pa_pstream *pstream; @@ -224,9 +231,10 @@ enum { CONNECTION_MESSAGE_REVOKE }; +static bool sink_input_process_underrun_cb(pa_sink_input *i); static int sink_input_pop_cb(pa_sink_input *i, size_t length, pa_memchunk *chunk); static void sink_input_kill_cb(pa_sink_input *i); -static void sink_input_suspend_cb(pa_sink_input *i, pa_bool_t suspend); +static void sink_input_suspend_cb(pa_sink_input *i, bool suspend); static void sink_input_moving_cb(pa_sink_input *i, pa_sink *dest); static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes); static void sink_input_update_max_rewind_cb(pa_sink_input *i, size_t nbytes); @@ -238,7 +246,7 @@ static void playback_stream_request_bytes(struct playback_stream*s); static void source_output_kill_cb(pa_source_output *o); static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk); -static void source_output_suspend_cb(pa_source_output *o, pa_bool_t suspend); +static void source_output_suspend_cb(pa_source_output *o, bool suspend); static void source_output_moving_cb(pa_source_output *o, pa_source *dest); static pa_usec_t source_output_get_latency_cb(pa_source_output *o); static void source_output_send_event_cb(pa_source_output *o, const char *event, pa_proplist *pl); @@ -285,6 +293,7 @@ static void command_remove_proplist(pa_pdispatch *pd, uint32_t command, uint32_t static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); +static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = { [PA_COMMAND_ERROR] = NULL, @@ -331,10 +340,12 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = { [PA_COMMAND_SET_SINK_VOLUME] = command_set_volume, [PA_COMMAND_SET_SINK_INPUT_VOLUME] = command_set_volume, [PA_COMMAND_SET_SOURCE_VOLUME] = command_set_volume, + [PA_COMMAND_SET_SOURCE_OUTPUT_VOLUME] = command_set_volume, [PA_COMMAND_SET_SINK_MUTE] = command_set_mute, [PA_COMMAND_SET_SINK_INPUT_MUTE] = command_set_mute, [PA_COMMAND_SET_SOURCE_MUTE] = command_set_mute, + [PA_COMMAND_SET_SOURCE_OUTPUT_MUTE] = command_set_mute, [PA_COMMAND_SUSPEND_SINK] = command_suspend, [PA_COMMAND_SUSPEND_SOURCE] = command_suspend, @@ -384,6 +395,8 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = { [PA_COMMAND_SET_SINK_PORT] = command_set_sink_or_source_port, [PA_COMMAND_SET_SOURCE_PORT] = command_set_sink_or_source_port, + [PA_COMMAND_SET_PORT_LATENCY_OFFSET] = command_set_port_latency_offset, + [PA_COMMAND_EXTENSION] = command_extension }; @@ -525,6 +538,7 @@ static void fix_record_buffer_attr_pre(record_stream *s) { * ->thread_info data! */ frame_size = pa_frame_size(&s->source_output->sample_spec); + s->buffer_attr = s->buffer_attr_req; if (s->buffer_attr.maxlength == (uint32_t) -1 || s->buffer_attr.maxlength > MAX_MEMBLOCKQ_LENGTH) s->buffer_attr.maxlength = MAX_MEMBLOCKQ_LENGTH; @@ -621,18 +635,24 @@ static record_stream* record_stream_new( pa_source *source, pa_sample_spec *ss, pa_channel_map *map, - pa_bool_t peak_detect, + pa_idxset *formats, pa_buffer_attr *attr, + pa_cvolume *volume, + bool muted, + bool muted_set, pa_source_output_flags_t flags, pa_proplist *p, - pa_bool_t adjust_latency, + bool adjust_latency, + bool early_requests, + bool relative_volume, + bool peak_detect, pa_sink_input *direct_on_input, - pa_bool_t early_requests, int *ret) { record_stream *s; pa_source_output *source_output = NULL; pa_source_output_new_data data; + char *memblockq_name; pa_assert(c); pa_assert(ss); @@ -645,10 +665,24 @@ static record_stream* record_stream_new( data.driver = __FILE__; data.module = c->options->module; data.client = c->client; - data.source = source; + if (source) + pa_source_output_new_data_set_source(&data, source, false); + if (pa_sample_spec_valid(ss)) + pa_source_output_new_data_set_sample_spec(&data, ss); + if (pa_channel_map_valid(map)) + pa_source_output_new_data_set_channel_map(&data, map); + if (formats) + pa_source_output_new_data_set_formats(&data, formats); data.direct_on_input = direct_on_input; - pa_source_output_new_data_set_sample_spec(&data, ss); - pa_source_output_new_data_set_channel_map(&data, map); + if (volume) { + pa_source_output_new_data_set_volume(&data, volume); + data.volume_is_absolute = !relative_volume; + data.save_volume = false; + } + if (muted_set) { + pa_source_output_new_data_set_muted(&data, muted); + data.save_muted = false; + } if (peak_detect) data.resample_method = PA_RESAMPLER_PEAKS; data.flags = flags; @@ -665,7 +699,7 @@ static record_stream* record_stream_new( s->parent.process_msg = record_stream_process_msg; s->connection = c; s->source_output = source_output; - s->buffer_attr = *attr; + s->buffer_attr_req = *attr; s->adjust_latency = adjust_latency; s->early_requests = early_requests; pa_atomic_store(&s->on_the_fly, 0); @@ -681,15 +715,18 @@ static record_stream* record_stream_new( fix_record_buffer_attr_pre(s); + memblockq_name = pa_sprintf_malloc("native protocol record stream memblockq [%u]", s->source_output->index); s->memblockq = pa_memblockq_new( + memblockq_name, 0, s->buffer_attr.maxlength, 0, - pa_frame_size(&source_output->sample_spec), + &source_output->sample_spec, 1, 0, 0, NULL); + pa_xfree(memblockq_name); pa_memblockq_get_attr(s->memblockq, &s->buffer_attr); fix_record_buffer_attr_post(s); @@ -781,20 +818,26 @@ static int playback_stream_process_msg(pa_msgobject *o, int code, void*userdata, pa_tagstruct_putu32(t, (uint32_t) l); pa_pstream_send_tagstruct(s->connection->pstream, t); -/* pa_log("Requesting %lu bytes", (unsigned long) l); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("Requesting %lu bytes", (unsigned long) l); +#endif break; } case PLAYBACK_STREAM_MESSAGE_UNDERFLOW: { pa_tagstruct *t; -/* pa_log("signalling underflow"); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("signalling underflow"); +#endif /* Report that we're empty */ t = pa_tagstruct_new(NULL, 0); pa_tagstruct_putu32(t, PA_COMMAND_UNDERFLOW); pa_tagstruct_putu32(t, (uint32_t) -1); /* tag */ pa_tagstruct_putu32(t, s->index); + if (s->connection->version >= 23) + pa_tagstruct_puts64(t, offset); pa_pstream_send_tagstruct(s->connection->pstream, t); break; } @@ -862,17 +905,19 @@ static void fix_playback_buffer_attr(playback_stream *s) { pa_assert(s); - /* pa_log("Client requested: maxlength=%li bytes tlength=%li bytes minreq=%li bytes prebuf=%li bytes", */ - /* (long) s->buffer_attr.maxlength, */ - /* (long) s->buffer_attr.tlength, */ - /* (long) s->buffer_attr.minreq, */ - /* (long) s->buffer_attr.prebuf); */ - - /* pa_log("Client requested: maxlength=%lu ms tlength=%lu ms minreq=%lu ms prebuf=%lu ms", */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.maxlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.tlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.minreq, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.prebuf, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC)); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("Client requested: maxlength=%li bytes tlength=%li bytes minreq=%li bytes prebuf=%li bytes", + (long) s->buffer_attr_req.maxlength, + (long) s->buffer_attr_req.tlength, + (long) s->buffer_attr_req.minreq, + (long) s->buffer_attr_req.prebuf); + + pa_log("Client requested: maxlength=%lu ms tlength=%lu ms minreq=%lu ms prebuf=%lu ms", + (unsigned long) (pa_bytes_to_usec(s->buffer_attr_req.maxlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), + (unsigned long) (pa_bytes_to_usec(s->buffer_attr_req.tlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), + (unsigned long) (pa_bytes_to_usec(s->buffer_attr_req.minreq, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), + (unsigned long) (pa_bytes_to_usec(s->buffer_attr_req.prebuf, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC)); +#endif /* This function will be called from the main thread, before as * well as after the sink input has been activated using @@ -880,6 +925,7 @@ static void fix_playback_buffer_attr(playback_stream *s) { * ->thread_info data, such as the memblockq! */ frame_size = pa_frame_size(&s->sink_input->sample_spec); + s->buffer_attr = s->buffer_attr_req; if (s->buffer_attr.maxlength == (uint32_t) -1 || s->buffer_attr.maxlength > MAX_MEMBLOCKQ_LENGTH) s->buffer_attr.maxlength = MAX_MEMBLOCKQ_LENGTH; @@ -890,9 +936,17 @@ static void fix_playback_buffer_attr(playback_stream *s) { s->buffer_attr.tlength = (uint32_t) pa_usec_to_bytes_round_up(DEFAULT_TLENGTH_MSEC*PA_USEC_PER_MSEC, &s->sink_input->sample_spec); if (s->buffer_attr.tlength <= 0) s->buffer_attr.tlength = (uint32_t) frame_size; + if (s->buffer_attr.tlength > s->buffer_attr.maxlength) + s->buffer_attr.tlength = s->buffer_attr.maxlength; - if (s->buffer_attr.minreq == (uint32_t) -1) - s->buffer_attr.minreq = (uint32_t) pa_usec_to_bytes_round_up(DEFAULT_PROCESS_MSEC*PA_USEC_PER_MSEC, &s->sink_input->sample_spec); + if (s->buffer_attr.minreq == (uint32_t) -1) { + uint32_t process = (uint32_t) pa_usec_to_bytes_round_up(DEFAULT_PROCESS_MSEC*PA_USEC_PER_MSEC, &s->sink_input->sample_spec); + /* With low-latency, tlength/4 gives a decent default in all of traditional, adjust latency and early request modes. */ + uint32_t m = s->buffer_attr.tlength / 4; + if (frame_size) + m -= m % frame_size; + s->buffer_attr.minreq = PA_MIN(process, m); + } if (s->buffer_attr.minreq <= 0) s->buffer_attr.minreq = (uint32_t) frame_size; @@ -923,9 +977,9 @@ static void fix_playback_buffer_attr(playback_stream *s) { * half the latency will be spent on the hw buffer, the other * half of it in the async buffer queue we maintain for each * client. In between we'll have a safety space of size - * 2*minreq. Why the 2*minreq? When the hw buffer is completey + * 2*minreq. Why the 2*minreq? When the hw buffer is completely * empty and needs to be filled, then our buffer must have - * enough data to fulfill this request immediatly and thus + * enough data to fulfill this request immediately and thus * have at least the same tlength as the size of the hw * buffer. It additionally needs space for 2 times minreq * because if the buffer ran empty and a partial fillup @@ -974,6 +1028,10 @@ static void fix_playback_buffer_attr(playback_stream *s) { tlength_usec -= s->configured_sink_latency; } + pa_log_debug("Requested latency=%0.2f ms, Received latency=%0.2f ms", + (double) sink_usec / PA_USEC_PER_MSEC, + (double) s->configured_sink_latency / PA_USEC_PER_MSEC); + /* FIXME: This is actually larger than necessary, since not all of * the sink latency is actually rewritable. */ if (tlength_usec < s->configured_sink_latency + 2*minreq_usec) @@ -1001,11 +1059,13 @@ static void fix_playback_buffer_attr(playback_stream *s) { s->buffer_attr.prebuf > max_prebuf) s->buffer_attr.prebuf = max_prebuf; - /* pa_log("Client accepted: maxlength=%lu ms tlength=%lu ms minreq=%lu ms prebuf=%lu ms", */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.maxlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.tlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.minreq, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), */ - /* (unsigned long) (pa_bytes_to_usec(s->buffer_attr.prebuf, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC)); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("Client accepted: maxlength=%lu ms tlength=%lu ms minreq=%lu ms prebuf=%lu ms", + (unsigned long) (pa_bytes_to_usec(s->buffer_attr.maxlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), + (unsigned long) (pa_bytes_to_usec(s->buffer_attr.tlength, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), + (unsigned long) (pa_bytes_to_usec(s->buffer_attr.minreq, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC), + (unsigned long) (pa_bytes_to_usec(s->buffer_attr.prebuf, &s->sink_input->sample_spec) / PA_USEC_PER_MSEC)); +#endif } /* Called from main context */ @@ -1014,25 +1074,31 @@ static playback_stream* playback_stream_new( pa_sink *sink, pa_sample_spec *ss, pa_channel_map *map, + pa_idxset *formats, pa_buffer_attr *a, pa_cvolume *volume, - pa_bool_t muted, - pa_bool_t muted_set, - uint32_t syncid, - uint32_t *missing, + bool muted, + bool muted_set, pa_sink_input_flags_t flags, pa_proplist *p, - pa_bool_t adjust_latency, - pa_bool_t early_requests, - pa_bool_t relative_volume, + bool adjust_latency, + bool early_requests, + bool relative_volume, + uint32_t syncid, + uint32_t *missing, int *ret) { - playback_stream *s, *ssync; + /* Note: This function takes ownership of the 'formats' param, so we need + * to take extra care to not leak it */ + + playback_stream *ssync; + playback_stream *s = NULL; pa_sink_input *sink_input = NULL; pa_memchunk silence; uint32_t idx; int64_t start_index; pa_sink_input_new_data data; + char *memblockq_name; pa_assert(c); pa_assert(ss); @@ -1057,7 +1123,7 @@ static playback_stream* playback_stream_new( sink = ssync->sink_input->sink; else if (sink != ssync->sink_input->sink) { *ret = PA_ERR_INVALID; - return NULL; + goto out; } } @@ -1067,20 +1133,25 @@ static playback_stream* playback_stream_new( data.driver = __FILE__; data.module = c->options->module; data.client = c->client; - if (sink) { - data.sink = sink; - data.save_sink = TRUE; + if (sink) + pa_sink_input_new_data_set_sink(&data, sink, false); + if (pa_sample_spec_valid(ss)) + pa_sink_input_new_data_set_sample_spec(&data, ss); + if (pa_channel_map_valid(map)) + pa_sink_input_new_data_set_channel_map(&data, map); + if (formats) { + pa_sink_input_new_data_set_formats(&data, formats); + /* Ownership transferred to new_data, so we don't free it ourselves */ + formats = NULL; } - pa_sink_input_new_data_set_sample_spec(&data, ss); - pa_sink_input_new_data_set_channel_map(&data, map); if (volume) { pa_sink_input_new_data_set_volume(&data, volume); data.volume_is_absolute = !relative_volume; - data.save_volume = TRUE; + data.save_volume = false; } if (muted_set) { pa_sink_input_new_data_set_muted(&data, muted); - data.save_muted = TRUE; + data.save_muted = false; } data.sync_base = ssync ? ssync->sink_input : NULL; data.flags = flags; @@ -1090,7 +1161,7 @@ static playback_stream* playback_stream_new( pa_sink_input_new_data_done(&data); if (!sink_input) - return NULL; + goto out; s = pa_msgobject_new(playback_stream); s->parent.parent.parent.free = playback_stream_free; @@ -1098,10 +1169,10 @@ static playback_stream* playback_stream_new( s->connection = c; s->syncid = syncid; s->sink_input = sink_input; - s->is_underrun = TRUE; - s->drain_request = FALSE; + s->is_underrun = true; + s->drain_request = false; pa_atomic_store(&s->missing, 0); - s->buffer_attr = *a; + s->buffer_attr_req = *a; s->adjust_latency = adjust_latency; s->early_requests = early_requests; pa_atomic_store(&s->seek_or_post_in_queue, 0); @@ -1109,6 +1180,7 @@ static playback_stream* playback_stream_new( s->sink_input->parent.process_msg = sink_input_process_msg; s->sink_input->pop = sink_input_pop_cb; + s->sink_input->process_underrun = sink_input_process_underrun_cb; s->sink_input->process_rewind = sink_input_process_rewind_cb; s->sink_input->update_max_rewind = sink_input_update_max_rewind_cb; s->sink_input->update_max_request = sink_input_update_max_request_cb; @@ -1123,22 +1195,27 @@ static playback_stream* playback_stream_new( fix_playback_buffer_attr(s); pa_sink_input_get_silence(sink_input, &silence); + memblockq_name = pa_sprintf_malloc("native protocol playback stream memblockq [%u]", s->sink_input->index); s->memblockq = pa_memblockq_new( + memblockq_name, start_index, s->buffer_attr.maxlength, s->buffer_attr.tlength, - pa_frame_size(&sink_input->sample_spec), + &sink_input->sample_spec, s->buffer_attr.prebuf, s->buffer_attr.minreq, 0, &silence); + pa_xfree(memblockq_name); pa_memblock_unref(silence.memblock); pa_memblockq_get_attr(s->memblockq, &s->buffer_attr); *missing = (uint32_t) pa_memblockq_pop_missing(s->memblockq); - /* pa_log("missing original: %li", (long int) *missing); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("missing original: %li", (long int) *missing); +#endif *ss = s->sink_input->sample_spec; *map = s->sink_input->channel_map; @@ -1152,6 +1229,11 @@ static playback_stream* playback_stream_new( (double) s->configured_sink_latency / PA_USEC_PER_MSEC); pa_sink_input_put(s->sink_input); + +out: + if (formats) + pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); + return s; } @@ -1174,7 +1256,9 @@ static void playback_stream_request_bytes(playback_stream *s) { if (m <= 0) return; -/* pa_log("request_bytes(%lu)", (unsigned long) m); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("request_bytes(%lu)", (unsigned long) m); +#endif previous_missing = pa_atomic_add(&s->missing, (int) m); minreq = pa_memblockq_get_minreq(s->memblockq); @@ -1266,8 +1350,8 @@ static void native_connection_free(pa_object *o) { native_connection_unlink(c); - pa_idxset_free(c->record_streams, NULL, NULL); - pa_idxset_free(c->output_streams, NULL, NULL); + pa_idxset_free(c->record_streams, NULL); + pa_idxset_free(c->output_streams, NULL); pa_pdispatch_unref(c->pdispatch); pa_pstream_unref(c->pstream); @@ -1330,7 +1414,7 @@ static void handle_seek(playback_stream *s, int64_t indexw) { pa_sink_input_request_rewind(s->sink_input, (size_t) (s->sink_input->thread_info.underrun_for == (uint64_t) -1 ? 0 : s->sink_input->thread_info.underrun_for), - FALSE, TRUE, FALSE); + false, true, false); } } else { @@ -1340,10 +1424,10 @@ static void handle_seek(playback_stream *s, int64_t indexw) { if (indexw < indexr) { /* OK, the sink already asked for this data, so - * let's have it usk us again */ + * let's have it ask us again */ pa_log_debug("Requesting rewind due to rewrite."); - pa_sink_input_request_rewind(s->sink_input, (size_t) (indexr - indexw), TRUE, FALSE, FALSE); + pa_sink_input_request_rewind(s->sink_input, (size_t) (indexr - indexw), true, false, false); } } @@ -1351,7 +1435,7 @@ static void handle_seek(playback_stream *s, int64_t indexw) { } static void flush_write_no_account(pa_memblockq *q) { - pa_memblockq_flush_write(q, FALSE); + pa_memblockq_flush_write(q, false); } /* Called from thread context */ @@ -1382,7 +1466,7 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int if (pa_log_ratelimit(PA_LOG_WARN)) pa_log_warn("Failed to push data into queue"); pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_OVERFLOW, NULL, 0, NULL, NULL); - pa_memblockq_seek(s->memblockq, (int64_t) chunk->length, PA_SEEK_RELATIVE, TRUE); + pa_memblockq_seek(s->memblockq, (int64_t) chunk->length, PA_SEEK_RELATIVE, true); } /* If more data is in queue, we rewind later instead. */ @@ -1448,7 +1532,7 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_DRAIN_ACK, userdata, 0, NULL, NULL); else { s->drain_tag = PA_PTR_TO_UINT(userdata); - s->drain_request = TRUE; + s->drain_request = true; } } @@ -1471,7 +1555,13 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int windex = pa_memblockq_get_write_index(s->memblockq); - pa_memblockq_prebuf_force(s->memblockq); + /* We enable prebuffering so that after CORKED -> RUNNING + * transitions we don't have trouble with underruns in case the + * buffer has too little data. This must not be done when draining + * has been requested, however, otherwise the buffered audio would + * never play. */ + if (!s->drain_request) + pa_memblockq_prebuf_force(s->memblockq); handle_seek(s, windex); @@ -1499,36 +1589,59 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int return pa_sink_input_process_msg(o, code, userdata, offset, chunk); } +static bool handle_input_underrun(playback_stream *s, bool force) { + bool send_drain; + + if (pa_memblockq_is_readable(s->memblockq)) + return false; + + if (!s->is_underrun) + pa_log_debug("%s %s of '%s'", force ? "Actual" : "Implicit", + s->drain_request ? "drain" : "underrun", pa_strnull(pa_proplist_gets(s->sink_input->proplist, PA_PROP_MEDIA_NAME))); + + send_drain = s->drain_request && (force || pa_sink_input_safe_to_remove(s->sink_input)); + + if (send_drain) { + s->drain_request = false; + pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_DRAIN_ACK, PA_UINT_TO_PTR(s->drain_tag), 0, NULL, NULL); + pa_log_debug("Drain acknowledged of '%s'", pa_strnull(pa_proplist_gets(s->sink_input->proplist, PA_PROP_MEDIA_NAME))); + } else if (!s->is_underrun) { + pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_UNDERFLOW, NULL, pa_memblockq_get_read_index(s->memblockq), NULL, NULL); + } + s->is_underrun = true; + playback_stream_request_bytes(s); + return true; +} + /* Called from thread context */ -static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) { +static bool sink_input_process_underrun_cb(pa_sink_input *i) { playback_stream *s; pa_sink_input_assert_ref(i); s = PLAYBACK_STREAM(i->userdata); playback_stream_assert_ref(s); - pa_assert(chunk); -/* pa_log("%s, pop(): %lu", pa_proplist_gets(i->proplist, PA_PROP_MEDIA_NAME), (unsigned long) pa_memblockq_get_length(s->memblockq)); */ + return handle_input_underrun(s, true); +} - if (pa_memblockq_is_readable(s->memblockq)) - s->is_underrun = FALSE; - else { - if (!s->is_underrun) - pa_log_debug("Underrun on '%s', %lu bytes in queue.", pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_MEDIA_NAME)), (unsigned long) pa_memblockq_get_length(s->memblockq)); +/* Called from thread context */ +static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) { + playback_stream *s; - if (s->drain_request && pa_sink_input_safe_to_remove(i)) { - s->drain_request = FALSE; - pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_DRAIN_ACK, PA_UINT_TO_PTR(s->drain_tag), 0, NULL, NULL); - } else if (!s->is_underrun) - pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_UNDERFLOW, NULL, 0, NULL, NULL); + pa_sink_input_assert_ref(i); + s = PLAYBACK_STREAM(i->userdata); + playback_stream_assert_ref(s); + pa_assert(chunk); - s->is_underrun = TRUE; +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("%s, pop(): %lu", pa_proplist_gets(i->proplist, PA_PROP_MEDIA_NAME), (unsigned long) pa_memblockq_get_length(s->memblockq)); +#endif - playback_stream_request_bytes(s); - } + if (!handle_input_underrun(s, false)) + s->is_underrun = false; /* This call will not fail with prebuf=0, hence we check for - underrun explicitly above */ + underrun explicitly in handle_input_underrun */ if (pa_memblockq_peek(s->memblockq, chunk) < 0) return -1; @@ -1629,7 +1742,7 @@ static void sink_input_send_event_cb(pa_sink_input *i, const char *event, pa_pro } /* Called from main context */ -static void sink_input_suspend_cb(pa_sink_input *i, pa_bool_t suspend) { +static void sink_input_suspend_cb(pa_sink_input *i, bool suspend) { playback_stream *s; pa_tagstruct *t; @@ -1767,7 +1880,7 @@ static void source_output_send_event_cb(pa_source_output *o, const char *event, } /* Called from main context */ -static void source_output_suspend_cb(pa_source_output *o, pa_bool_t suspend) { +static void source_output_suspend_cb(pa_source_output *o, bool suspend) { record_stream *s; pa_tagstruct *t; @@ -1837,6 +1950,13 @@ if (!(expression)) { \ } \ } while(0); +#define CHECK_VALIDITY_GOTO(pstream, expression, tag, error, label) do { \ +if (!(expression)) { \ + pa_pstream_send_error((pstream), (tag), (error)); \ + goto label; \ +} \ +} while(0); + static pa_tagstruct *reply_new(uint32_t tag) { pa_tagstruct *reply; @@ -1849,7 +1969,7 @@ static pa_tagstruct *reply_new(uint32_t tag) { static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); playback_stream *s; - uint32_t sink_index, syncid, missing; + uint32_t sink_index, syncid, missing = 0; pa_buffer_attr attr; const char *name = NULL, *sink_name; pa_sample_spec ss; @@ -1857,28 +1977,32 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u pa_tagstruct *reply; pa_sink *sink = NULL; pa_cvolume volume; - pa_bool_t - corked = FALSE, - no_remap = FALSE, - no_remix = FALSE, - fix_format = FALSE, - fix_rate = FALSE, - fix_channels = FALSE, - no_move = FALSE, - variable_rate = FALSE, - muted = FALSE, - adjust_latency = FALSE, - early_requests = FALSE, - dont_inhibit_auto_suspend = FALSE, - muted_set = FALSE, - fail_on_suspend = FALSE, - relative_volume = FALSE, - passthrough = FALSE; + bool + corked = false, + no_remap = false, + no_remix = false, + fix_format = false, + fix_rate = false, + fix_channels = false, + no_move = false, + variable_rate = false, + muted = false, + adjust_latency = false, + early_requests = false, + dont_inhibit_auto_suspend = false, + volume_set = true, + muted_set = false, + fail_on_suspend = false, + relative_volume = false, + passthrough = false; pa_sink_input_flags_t flags = 0; - pa_proplist *p; - pa_bool_t volume_set = TRUE; + pa_proplist *p = NULL; int ret = PA_ERR_INVALID; + uint8_t n_formats = 0; + pa_format_info *format; + pa_idxset *formats = NULL; + uint32_t i; pa_native_connection_assert_ref(c); pa_assert(t); @@ -1901,17 +2025,14 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u PA_TAG_INVALID) < 0) { protocol_error(c); - return; + goto finish; } - CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); - CHECK_VALIDITY(c->pstream, !sink_name || pa_namereg_is_valid_name_or_wildcard(sink_name, PA_NAMEREG_SINK), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, sink_index == PA_INVALID_INDEX || !sink_name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !sink_name || sink_index == PA_INVALID_INDEX, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, pa_channel_map_valid(&map), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, pa_sample_spec_valid(&ss), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, pa_cvolume_valid(&volume), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, map.channels == ss.channels && volume.channels == ss.channels, tag, PA_ERR_INVALID); + CHECK_VALIDITY_GOTO(c->pstream, c->authorized, tag, PA_ERR_ACCESS, finish); + CHECK_VALIDITY_GOTO(c->pstream, !sink_name || pa_namereg_is_valid_name_or_wildcard(sink_name, PA_NAMEREG_SINK), tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, sink_index == PA_INVALID_INDEX || !sink_name, tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, !sink_name || sink_index == PA_INVALID_INDEX, tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, pa_cvolume_valid(&volume), tag, PA_ERR_INVALID, finish); p = pa_proplist_new(); @@ -1930,8 +2051,7 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u pa_tagstruct_get_boolean(t, &variable_rate) < 0) { protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } @@ -1940,9 +2060,9 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u if (pa_tagstruct_get_boolean(t, &muted) < 0 || pa_tagstruct_get_boolean(t, &adjust_latency) < 0 || pa_tagstruct_get_proplist(t, p) < 0) { + protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } @@ -1950,9 +2070,9 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u if (pa_tagstruct_get_boolean(t, &volume_set) < 0 || pa_tagstruct_get_boolean(t, &early_requests) < 0) { + protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } @@ -1961,18 +2081,18 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u if (pa_tagstruct_get_boolean(t, &muted_set) < 0 || pa_tagstruct_get_boolean(t, &dont_inhibit_auto_suspend) < 0 || pa_tagstruct_get_boolean(t, &fail_on_suspend) < 0) { + protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } if (c->version >= 17) { if (pa_tagstruct_get_boolean(t, &relative_volume) < 0) { + protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } @@ -1980,31 +2100,57 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u if (pa_tagstruct_get_boolean(t, &passthrough) < 0 ) { protocol_error(c); - pa_proplist_free(p); - return; + goto finish; + } + } + + if (c->version >= 21) { + + if (pa_tagstruct_getu8(t, &n_formats) < 0) { + protocol_error(c); + goto finish; + } + + if (n_formats) + formats = pa_idxset_new(NULL, NULL); + + for (i = 0; i < n_formats; i++) { + format = pa_format_info_new(); + if (pa_tagstruct_get_format_info(t, format) < 0) { + protocol_error(c); + goto finish; + } + pa_idxset_put(formats, format, NULL); + } + } + + if (n_formats == 0) { + CHECK_VALIDITY_GOTO(c->pstream, pa_sample_spec_valid(&ss), tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, map.channels == ss.channels && volume.channels == ss.channels, tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, pa_channel_map_valid(&map), tag, PA_ERR_INVALID, finish); + } else { + PA_IDXSET_FOREACH(format, formats, i) { + CHECK_VALIDITY_GOTO(c->pstream, pa_format_info_valid(format), tag, PA_ERR_INVALID, finish); } } if (!pa_tagstruct_eof(t)) { protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } if (sink_index != PA_INVALID_INDEX) { if (!(sink = pa_idxset_get_by_index(c->protocol->core->sinks, sink_index))) { pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY); - pa_proplist_free(p); - return; + goto finish; } } else if (sink_name) { if (!(sink = pa_namereg_get(c->protocol->core, sink_name, PA_NAMEREG_SINK))) { pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY); - pa_proplist_free(p); - return; + goto finish; } } @@ -2021,14 +2167,15 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u (fail_on_suspend ? PA_SINK_INPUT_NO_CREATE_ON_SUSPEND|PA_SINK_INPUT_KILL_ON_SUSPEND : 0) | (passthrough ? PA_SINK_INPUT_PASSTHROUGH : 0); - /* Only since protocol version 15 there's a seperate muted_set + /* Only since protocol version 15 there's a separate muted_set * flag. For older versions we synthesize it here */ muted_set = muted_set || muted; - s = playback_stream_new(c, sink, &ss, &map, &attr, volume_set ? &volume : NULL, muted, muted_set, syncid, &missing, flags, p, adjust_latency, early_requests, relative_volume, &ret); - pa_proplist_free(p); + s = playback_stream_new(c, sink, &ss, &map, formats, &attr, volume_set ? &volume : NULL, muted, muted_set, flags, p, adjust_latency, early_requests, relative_volume, syncid, &missing, &ret); + /* We no longer own the formats idxset */ + formats = NULL; - CHECK_VALIDITY(c->pstream, s, tag, ret); + CHECK_VALIDITY_GOTO(c->pstream, s, tag, ret, finish); reply = reply_new(tag); pa_tagstruct_putu32(reply, s->index); @@ -2036,7 +2183,9 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u pa_tagstruct_putu32(reply, s->sink_input->index); pa_tagstruct_putu32(reply, missing); -/* pa_log("initial request is %u", missing); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("initial request is %u", missing); +#endif if (c->version >= 9) { /* Since 0.9.0 we support sending the buffer metrics back to the client */ @@ -2064,7 +2213,24 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u if (c->version >= 13) pa_tagstruct_put_usec(reply, s->configured_sink_latency); + if (c->version >= 21) { + /* Send back the format we negotiated */ + if (s->sink_input->format) + pa_tagstruct_put_format_info(reply, s->sink_input->format); + else { + pa_format_info *f = pa_format_info_new(); + pa_tagstruct_put_format_info(reply, f); + pa_format_info_free(f); + } + } + pa_pstream_send_tagstruct(c->pstream, reply); + +finish: + if (p) + pa_proplist_free(p); + if (formats) + pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); } static void command_delete_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { @@ -2135,25 +2301,36 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin pa_channel_map map; pa_tagstruct *reply; pa_source *source = NULL; - pa_bool_t - corked = FALSE, - no_remap = FALSE, - no_remix = FALSE, - fix_format = FALSE, - fix_rate = FALSE, - fix_channels = FALSE, - no_move = FALSE, - variable_rate = FALSE, - adjust_latency = FALSE, - peak_detect = FALSE, - early_requests = FALSE, - dont_inhibit_auto_suspend = FALSE, - fail_on_suspend = FALSE; + pa_cvolume volume; + bool + corked = false, + no_remap = false, + no_remix = false, + fix_format = false, + fix_rate = false, + fix_channels = false, + no_move = false, + variable_rate = false, + muted = false, + adjust_latency = false, + peak_detect = false, + early_requests = false, + dont_inhibit_auto_suspend = false, + volume_set = false, + muted_set = false, + fail_on_suspend = false, + relative_volume = false, + passthrough = false; + pa_source_output_flags_t flags = 0; - pa_proplist *p; + pa_proplist *p = NULL; uint32_t direct_on_input_idx = PA_INVALID_INDEX; pa_sink_input *direct_on_input = NULL; int ret = PA_ERR_INVALID; + uint8_t n_formats = 0; + pa_format_info *format; + pa_idxset *formats = NULL; + uint32_t i; pa_native_connection_assert_ref(c); pa_assert(t); @@ -2168,17 +2345,15 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin pa_tagstruct_getu32(t, &attr.maxlength) < 0 || pa_tagstruct_get_boolean(t, &corked) < 0 || pa_tagstruct_getu32(t, &attr.fragsize) < 0) { + protocol_error(c); - return; + goto finish; } - CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); - CHECK_VALIDITY(c->pstream, !source_name || pa_namereg_is_valid_name_or_wildcard(source_name, PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, source_index == PA_INVALID_INDEX || !source_name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !source_name || source_index == PA_INVALID_INDEX, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, pa_sample_spec_valid(&ss), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, pa_channel_map_valid(&map), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, map.channels == ss.channels, tag, PA_ERR_INVALID); + CHECK_VALIDITY_GOTO(c->pstream, c->authorized, tag, PA_ERR_ACCESS, finish); + CHECK_VALIDITY_GOTO(c->pstream, !source_name || pa_namereg_is_valid_name_or_wildcard(source_name, PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, source_index == PA_INVALID_INDEX || !source_name, tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, !source_name || source_index == PA_INVALID_INDEX, tag, PA_ERR_INVALID, finish); p = pa_proplist_new(); @@ -2197,8 +2372,7 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin pa_tagstruct_get_boolean(t, &variable_rate) < 0) { protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } @@ -2208,9 +2382,9 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin pa_tagstruct_get_boolean(t, &adjust_latency) < 0 || pa_tagstruct_get_proplist(t, p) < 0 || pa_tagstruct_getu32(t, &direct_on_input_idx) < 0) { + protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } @@ -2218,8 +2392,7 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin if (pa_tagstruct_get_boolean(t, &early_requests) < 0) { protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } } @@ -2227,32 +2400,76 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin if (pa_tagstruct_get_boolean(t, &dont_inhibit_auto_suspend) < 0 || pa_tagstruct_get_boolean(t, &fail_on_suspend) < 0) { + protocol_error(c); - pa_proplist_free(p); - return; + goto finish; + } + } + + if (c->version >= 22) { + /* For newer client versions (with per-source-output volumes), we try + * to make the behaviour for playback and record streams the same. */ + volume_set = true; + + if (pa_tagstruct_getu8(t, &n_formats) < 0) { + protocol_error(c); + goto finish; + } + + if (n_formats) + formats = pa_idxset_new(NULL, NULL); + + for (i = 0; i < n_formats; i++) { + format = pa_format_info_new(); + if (pa_tagstruct_get_format_info(t, format) < 0) { + protocol_error(c); + goto finish; + } + pa_idxset_put(formats, format, NULL); + } + + if (pa_tagstruct_get_cvolume(t, &volume) < 0 || + pa_tagstruct_get_boolean(t, &muted) < 0 || + pa_tagstruct_get_boolean(t, &volume_set) < 0 || + pa_tagstruct_get_boolean(t, &muted_set) < 0 || + pa_tagstruct_get_boolean(t, &relative_volume) < 0 || + pa_tagstruct_get_boolean(t, &passthrough) < 0) { + + protocol_error(c); + goto finish; + } + + CHECK_VALIDITY_GOTO(c->pstream, pa_cvolume_valid(&volume), tag, PA_ERR_INVALID, finish); + } + + if (n_formats == 0) { + CHECK_VALIDITY_GOTO(c->pstream, pa_sample_spec_valid(&ss), tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, map.channels == ss.channels, tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, c->version < 22 || (volume.channels == ss.channels), tag, PA_ERR_INVALID, finish); + CHECK_VALIDITY_GOTO(c->pstream, pa_channel_map_valid(&map), tag, PA_ERR_INVALID, finish); + } else { + PA_IDXSET_FOREACH(format, formats, i) { + CHECK_VALIDITY_GOTO(c->pstream, pa_format_info_valid(format), tag, PA_ERR_INVALID, finish); } } if (!pa_tagstruct_eof(t)) { protocol_error(c); - pa_proplist_free(p); - return; + goto finish; } if (source_index != PA_INVALID_INDEX) { if (!(source = pa_idxset_get_by_index(c->protocol->core->sources, source_index))) { pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY); - pa_proplist_free(p); - return; + goto finish; } } else if (source_name) { if (!(source = pa_namereg_get(c->protocol->core, source_name, PA_NAMEREG_SOURCE))) { pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY); - pa_proplist_free(p); - return; + goto finish; } } @@ -2260,8 +2477,7 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin if (!(direct_on_input = pa_idxset_get_by_index(c->protocol->core->sink_inputs, direct_on_input_idx))) { pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY); - pa_proplist_free(p); - return; + goto finish; } } @@ -2275,12 +2491,12 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin (no_move ? PA_SOURCE_OUTPUT_DONT_MOVE : 0) | (variable_rate ? PA_SOURCE_OUTPUT_VARIABLE_RATE : 0) | (dont_inhibit_auto_suspend ? PA_SOURCE_OUTPUT_DONT_INHIBIT_AUTO_SUSPEND : 0) | - (fail_on_suspend ? PA_SOURCE_OUTPUT_NO_CREATE_ON_SUSPEND|PA_SOURCE_OUTPUT_KILL_ON_SUSPEND : 0); + (fail_on_suspend ? PA_SOURCE_OUTPUT_NO_CREATE_ON_SUSPEND|PA_SOURCE_OUTPUT_KILL_ON_SUSPEND : 0) | + (passthrough ? PA_SOURCE_OUTPUT_PASSTHROUGH : 0); - s = record_stream_new(c, source, &ss, &map, peak_detect, &attr, flags, p, adjust_latency, direct_on_input, early_requests, &ret); - pa_proplist_free(p); + s = record_stream_new(c, source, &ss, &map, formats, &attr, volume_set ? &volume : NULL, muted, muted_set, flags, p, adjust_latency, early_requests, relative_volume, peak_detect, direct_on_input, &ret); - CHECK_VALIDITY(c->pstream, s, tag, ret); + CHECK_VALIDITY_GOTO(c->pstream, s, tag, ret, finish); reply = reply_new(tag); pa_tagstruct_putu32(reply, s->index); @@ -2311,7 +2527,24 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin if (c->version >= 13) pa_tagstruct_put_usec(reply, s->configured_source_latency); + if (c->version >= 22) { + /* Send back the format we negotiated */ + if (s->source_output->format) + pa_tagstruct_put_format_info(reply, s->source_output->format); + else { + pa_format_info *f = pa_format_info_new(); + pa_tagstruct_put_format_info(reply, f); + pa_format_info_free(f); + } + } + pa_pstream_send_tagstruct(c->pstream, reply); + +finish: + if (p) + pa_proplist_free(p); + if (formats) + pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); } static void command_exit(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { @@ -2327,7 +2560,7 @@ static void command_exit(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta } CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); - ret = pa_core_exit(c->protocol->core, FALSE, 0); + ret = pa_core_exit(c->protocol->core, false, 0); CHECK_VALIDITY(c->pstream, ret >= 0, tag, PA_ERR_ACCESS); pa_log_debug("Client %s asks us to terminate.", pa_strnull(pa_proplist_gets(c->client->proplist, PA_PROP_APPLICATION_PROCESS_BINARY))); @@ -2339,7 +2572,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); const void*cookie; pa_tagstruct *reply; - pa_bool_t shm_on_remote = FALSE, do_shm; + bool shm_on_remote = false, do_shm; pa_native_connection_assert_ref(c); pa_assert(t); @@ -2370,14 +2603,14 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta pa_proplist_setf(c->client->proplist, "native-protocol.version", "%u", c->version); if (!c->authorized) { - pa_bool_t success = FALSE; + bool success = false; #ifdef HAVE_CREDS const pa_creds *creds; if ((creds = pa_pdispatch_creds(pd))) { if (creds->uid == getuid()) - success = TRUE; + success = true; else if (c->options->auth_group) { int r; gid_t gid; @@ -2385,13 +2618,13 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta if ((gid = pa_get_gid_of_group(c->options->auth_group)) == (gid_t) -1) pa_log_warn("Failed to get GID of group '%s'", c->options->auth_group); else if (gid == creds->gid) - success = TRUE; + success = true; if (!success) { if ((r = pa_uid_in_group(creds->uid, c->options->auth_group)) < 0) pa_log_warn("Failed to check group membership."); else if (r > 0) - success = TRUE; + success = true; } } @@ -2407,7 +2640,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta if ((ac = pa_auth_cookie_read(c->options->auth_cookie, PA_NATIVE_COOKIE_LENGTH))) if (memcmp(ac, cookie, PA_NATIVE_COOKIE_LENGTH) == 0) - success = TRUE; + success = true; } if (!success) { @@ -2416,7 +2649,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta return; } - c->authorized = TRUE; + c->authorized = true; if (c->auth_timeout_event) { c->protocol->core->mainloop->time_free(c->auth_timeout_event); c->auth_timeout_event = NULL; @@ -2432,7 +2665,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta if (do_shm) if (c->version < 10 || (c->version >= 13 && !shm_on_remote)) - do_shm = FALSE; + do_shm = false; #ifdef HAVE_CREDS if (do_shm) { @@ -2442,7 +2675,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta const pa_creds *creds; if (!(creds = pa_pdispatch_creds(pd)) || getuid() != creds->uid) - do_shm = FALSE; + do_shm = false; } #endif @@ -2724,7 +2957,7 @@ static void command_create_upload_stream(pa_pdispatch *pd, uint32_t command, uin if (!name || !pa_namereg_is_valid_name(name)) { pa_proplist_free(p); - CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, false, tag, PA_ERR_INVALID); } s = upload_stream_new(c, &ss, &map, name, length, p); @@ -2896,13 +3129,13 @@ static void sink_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_sin PA_TAG_SAMPLE_SPEC, &fixed_ss, PA_TAG_CHANNEL_MAP, &sink->channel_map, PA_TAG_U32, sink->module ? sink->module->index : PA_INVALID_INDEX, - PA_TAG_CVOLUME, pa_sink_get_volume(sink, FALSE), - PA_TAG_BOOLEAN, pa_sink_get_mute(sink, FALSE), + PA_TAG_CVOLUME, pa_sink_get_volume(sink, false), + PA_TAG_BOOLEAN, pa_sink_get_mute(sink, false), PA_TAG_U32, sink->monitor_source ? sink->monitor_source->index : PA_INVALID_INDEX, PA_TAG_STRING, sink->monitor_source ? sink->monitor_source->name : NULL, PA_TAG_USEC, pa_sink_get_latency(sink), PA_TAG_STRING, sink->driver, - PA_TAG_U32, sink->flags & ~PA_SINK_SHARE_VOLUME_WITH_MASTER, + PA_TAG_U32, sink->flags & PA_SINK_CLIENT_FLAGS_MASK, PA_TAG_INVALID); if (c->version >= 13) { @@ -2920,21 +3153,34 @@ static void sink_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_sin } if (c->version >= 16) { - pa_tagstruct_putu32(t, sink->ports ? pa_hashmap_size(sink->ports) : 0); + void *state; + pa_device_port *p; - if (sink->ports) { - void *state; - pa_device_port *p; + pa_tagstruct_putu32(t, pa_hashmap_size(sink->ports)); - PA_HASHMAP_FOREACH(p, sink->ports, state) { - pa_tagstruct_puts(t, p->name); - pa_tagstruct_puts(t, p->description); - pa_tagstruct_putu32(t, p->priority); - } + PA_HASHMAP_FOREACH(p, sink->ports, state) { + pa_tagstruct_puts(t, p->name); + pa_tagstruct_puts(t, p->description); + pa_tagstruct_putu32(t, p->priority); + if (c->version >= 24) + pa_tagstruct_putu32(t, p->available); } pa_tagstruct_puts(t, sink->active_port ? sink->active_port->name : NULL); } + + if (c->version >= 21) { + uint32_t i; + pa_format_info *f; + pa_idxset *formats = pa_sink_get_formats(sink); + + pa_tagstruct_putu8(t, (uint8_t) pa_idxset_size(formats)); + PA_IDXSET_FOREACH(f, formats, i) { + pa_tagstruct_put_format_info(t, f); + } + + pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); + } } static void source_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_source *source) { @@ -2953,13 +3199,13 @@ static void source_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_s PA_TAG_SAMPLE_SPEC, &fixed_ss, PA_TAG_CHANNEL_MAP, &source->channel_map, PA_TAG_U32, source->module ? source->module->index : PA_INVALID_INDEX, - PA_TAG_CVOLUME, pa_source_get_volume(source, FALSE), - PA_TAG_BOOLEAN, pa_source_get_mute(source, FALSE), + PA_TAG_CVOLUME, pa_source_get_volume(source, false), + PA_TAG_BOOLEAN, pa_source_get_mute(source, false), PA_TAG_U32, source->monitor_of ? source->monitor_of->index : PA_INVALID_INDEX, PA_TAG_STRING, source->monitor_of ? source->monitor_of->name : NULL, PA_TAG_USEC, pa_source_get_latency(source), PA_TAG_STRING, source->driver, - PA_TAG_U32, source->flags, + PA_TAG_U32, source->flags & PA_SOURCE_CLIENT_FLAGS_MASK, PA_TAG_INVALID); if (c->version >= 13) { @@ -2977,22 +3223,34 @@ static void source_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_s } if (c->version >= 16) { + void *state; + pa_device_port *p; - pa_tagstruct_putu32(t, source->ports ? pa_hashmap_size(source->ports) : 0); - - if (source->ports) { - void *state; - pa_device_port *p; + pa_tagstruct_putu32(t, pa_hashmap_size(source->ports)); - PA_HASHMAP_FOREACH(p, source->ports, state) { - pa_tagstruct_puts(t, p->name); - pa_tagstruct_puts(t, p->description); - pa_tagstruct_putu32(t, p->priority); - } + PA_HASHMAP_FOREACH(p, source->ports, state) { + pa_tagstruct_puts(t, p->name); + pa_tagstruct_puts(t, p->description); + pa_tagstruct_putu32(t, p->priority); + if (c->version >= 24) + pa_tagstruct_putu32(t, p->available); } pa_tagstruct_puts(t, source->active_port ? source->active_port->name : NULL); } + + if (c->version >= 22) { + uint32_t i; + pa_format_info *f; + pa_idxset *formats = pa_source_get_formats(source); + + pa_tagstruct_putu8(t, (uint8_t) pa_idxset_size(formats)); + PA_IDXSET_FOREACH(f, formats, i) { + pa_tagstruct_put_format_info(t, f); + } + + pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); + } } static void client_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_client *client) { @@ -3011,6 +3269,7 @@ static void client_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_c static void card_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_card *card) { void *state = NULL; pa_card_profile *p; + pa_device_port *port; pa_assert(t); pa_assert(card); @@ -3020,20 +3279,45 @@ static void card_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_car pa_tagstruct_putu32(t, card->module ? card->module->index : PA_INVALID_INDEX); pa_tagstruct_puts(t, card->driver); - pa_tagstruct_putu32(t, card->profiles ? pa_hashmap_size(card->profiles) : 0); + pa_tagstruct_putu32(t, pa_hashmap_size(card->profiles)); - if (card->profiles) { - while ((p = pa_hashmap_iterate(card->profiles, &state, NULL))) { - pa_tagstruct_puts(t, p->name); - pa_tagstruct_puts(t, p->description); - pa_tagstruct_putu32(t, p->n_sinks); - pa_tagstruct_putu32(t, p->n_sources); - pa_tagstruct_putu32(t, p->priority); - } + PA_HASHMAP_FOREACH(p, card->profiles, state) { + pa_tagstruct_puts(t, p->name); + pa_tagstruct_puts(t, p->description); + pa_tagstruct_putu32(t, p->n_sinks); + pa_tagstruct_putu32(t, p->n_sources); + pa_tagstruct_putu32(t, p->priority); + + if (c->version >= 29) + pa_tagstruct_putu32(t, (p->available != PA_AVAILABLE_NO)); } - pa_tagstruct_puts(t, card->active_profile ? card->active_profile->name : NULL); + pa_tagstruct_puts(t, card->active_profile->name); pa_tagstruct_put_proplist(t, card->proplist); + + if (c->version < 26) + return; + + pa_tagstruct_putu32(t, pa_hashmap_size(card->ports)); + + PA_HASHMAP_FOREACH(port, card->ports, state) { + void *state2; + + pa_tagstruct_puts(t, port->name); + pa_tagstruct_puts(t, port->description); + pa_tagstruct_putu32(t, port->priority); + pa_tagstruct_putu32(t, port->available); + pa_tagstruct_putu8(t, port->direction); + pa_tagstruct_put_proplist(t, port->proplist); + + pa_tagstruct_putu32(t, pa_hashmap_size(port->profiles)); + + PA_HASHMAP_FOREACH(p, port->profiles, state2) + pa_tagstruct_puts(t, p->name); + + if (c->version >= 27) + pa_tagstruct_puts64(t, port->latency_offset); + } } static void module_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_module *module) { @@ -3046,7 +3330,7 @@ static void module_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_m pa_tagstruct_putu32(t, (uint32_t) pa_module_get_n_used(module)); if (c->version < 15) - pa_tagstruct_put_boolean(t, FALSE); /* autoload is obsolete */ + pa_tagstruct_put_boolean(t, false); /* autoload is obsolete */ if (c->version >= 15) pa_tagstruct_put_proplist(t, module->proplist); @@ -3056,7 +3340,7 @@ static void sink_input_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_sample_spec fixed_ss; pa_usec_t sink_latency; pa_cvolume v; - pa_bool_t has_volume = FALSE; + bool has_volume = false; pa_assert(t); pa_sink_input_assert_ref(s); @@ -3065,7 +3349,7 @@ static void sink_input_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, has_volume = pa_sink_input_is_volume_readable(s); if (has_volume) - pa_sink_input_get_volume(s, &v, TRUE); + pa_sink_input_get_volume(s, &v, true); else pa_cvolume_reset(&v, fixed_ss.channels); @@ -3082,26 +3366,36 @@ static void sink_input_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_tagstruct_puts(t, pa_resample_method_to_string(pa_sink_input_get_resample_method(s))); pa_tagstruct_puts(t, s->driver); if (c->version >= 11) - pa_tagstruct_put_boolean(t, pa_sink_input_get_mute(s)); + pa_tagstruct_put_boolean(t, s->muted); if (c->version >= 13) pa_tagstruct_put_proplist(t, s->proplist); if (c->version >= 19) pa_tagstruct_put_boolean(t, (pa_sink_input_get_state(s) == PA_SINK_INPUT_CORKED)); if (c->version >= 20) { pa_tagstruct_put_boolean(t, has_volume); - pa_tagstruct_put_boolean(t, has_volume ? !pa_sink_input_is_volume_writable(s) : FALSE); + pa_tagstruct_put_boolean(t, s->volume_writable); } + if (c->version >= 21) + pa_tagstruct_put_format_info(t, s->format); } static void source_output_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_source_output *s) { pa_sample_spec fixed_ss; pa_usec_t source_latency; + pa_cvolume v; + bool has_volume = false; pa_assert(t); pa_source_output_assert_ref(s); fixup_sample_spec(c, &fixed_ss, &s->sample_spec); + has_volume = pa_source_output_is_volume_readable(s); + if (has_volume) + pa_source_output_get_volume(s, &v, true); + else + pa_cvolume_reset(&v, fixed_ss.channels); + pa_tagstruct_putu32(t, s->index); pa_tagstruct_puts(t, pa_strnull(pa_proplist_gets(s->proplist, PA_PROP_MEDIA_NAME))); pa_tagstruct_putu32(t, s->module ? s->module->index : PA_INVALID_INDEX); @@ -3117,6 +3411,13 @@ static void source_output_fill_tagstruct(pa_native_connection *c, pa_tagstruct * pa_tagstruct_put_proplist(t, s->proplist); if (c->version >= 19) pa_tagstruct_put_boolean(t, (pa_source_output_get_state(s) == PA_SOURCE_OUTPUT_CORKED)); + if (c->version >= 22) { + pa_tagstruct_put_cvolume(t, &v); + pa_tagstruct_put_boolean(t, s->muted); + pa_tagstruct_put_boolean(t, has_volume); + pa_tagstruct_put_boolean(t, s->volume_writable); + pa_tagstruct_put_format_info(t, s->format); + } } static void scache_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_scache_entry *e) { @@ -3186,9 +3487,10 @@ static void command_get_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, p (command == PA_COMMAND_GET_SOURCE_INFO && pa_namereg_is_valid_name_or_wildcard(name, PA_NAMEREG_SOURCE)) || pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, command == PA_COMMAND_GET_SINK_INFO || + command == PA_COMMAND_GET_SOURCE_INFO || + (idx != PA_INVALID_INDEX || name), tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); if (command == PA_COMMAND_GET_SINK_INFO) { if (idx != PA_INVALID_INDEX) @@ -3285,7 +3587,7 @@ static void command_get_info_list(pa_pdispatch *pd, uint32_t command, uint32_t t } if (i) { - for (p = pa_idxset_first(i, &idx); p; p = pa_idxset_next(i, &idx)) { + PA_IDXSET_FOREACH(p, i, idx) { if (command == PA_COMMAND_GET_SINK_INFO_LIST) sink_fill_tagstruct(c, reply, p); else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST) @@ -3411,6 +3713,7 @@ static void command_set_volume( pa_sink *sink = NULL; pa_source *source = NULL; pa_sink_input *si = NULL; + pa_source_output *so = NULL; const char *name = NULL; const char *client_name; @@ -3428,9 +3731,7 @@ static void command_set_volume( CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name_or_wildcard(name, command == PA_COMMAND_SET_SINK_VOLUME ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, pa_cvolume_valid(&volume), tag, PA_ERR_INVALID); switch (command) { @@ -3453,11 +3754,15 @@ static void command_set_volume( si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx); break; + case PA_COMMAND_SET_SOURCE_OUTPUT_VOLUME: + so = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx); + break; + default: pa_assert_not_reached(); } - CHECK_VALIDITY(c->pstream, si || sink || source, tag, PA_ERR_NOENTITY); + CHECK_VALIDITY(c->pstream, si || so || sink || source, tag, PA_ERR_NOENTITY); client_name = pa_strnull(pa_proplist_gets(c->client->proplist, PA_PROP_APPLICATION_PROCESS_BINARY)); @@ -3465,20 +3770,28 @@ static void command_set_volume( CHECK_VALIDITY(c->pstream, volume.channels == 1 || pa_cvolume_compatible(&volume, &sink->sample_spec), tag, PA_ERR_INVALID); pa_log_debug("Client %s changes volume of sink %s.", client_name, sink->name); - pa_sink_set_volume(sink, &volume, TRUE, TRUE); + pa_sink_set_volume(sink, &volume, true, true); } else if (source) { CHECK_VALIDITY(c->pstream, volume.channels == 1 || pa_cvolume_compatible(&volume, &source->sample_spec), tag, PA_ERR_INVALID); pa_log_debug("Client %s changes volume of source %s.", client_name, source->name); - pa_source_set_volume(source, &volume, TRUE); + pa_source_set_volume(source, &volume, true, true); } else if (si) { - CHECK_VALIDITY(c->pstream, pa_sink_input_is_volume_writable(si), tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, si->volume_writable, tag, PA_ERR_BADSTATE); CHECK_VALIDITY(c->pstream, volume.channels == 1 || pa_cvolume_compatible(&volume, &si->sample_spec), tag, PA_ERR_INVALID); pa_log_debug("Client %s changes volume of sink input %s.", client_name, pa_strnull(pa_proplist_gets(si->proplist, PA_PROP_MEDIA_NAME))); - pa_sink_input_set_volume(si, &volume, TRUE, TRUE); + pa_sink_input_set_volume(si, &volume, true, true); + } else if (so) { + CHECK_VALIDITY(c->pstream, so->volume_writable, tag, PA_ERR_BADSTATE); + CHECK_VALIDITY(c->pstream, volume.channels == 1 || pa_cvolume_compatible(&volume, &so->sample_spec), tag, PA_ERR_INVALID); + + pa_log_debug("Client %s changes volume of source output %s.", + client_name, + pa_strnull(pa_proplist_gets(so->proplist, PA_PROP_MEDIA_NAME))); + pa_source_output_set_volume(so, &volume, true, true); } pa_pstream_send_simple_ack(c->pstream, tag); @@ -3493,10 +3806,11 @@ static void command_set_mute( pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); uint32_t idx; - pa_bool_t mute; + bool mute; pa_sink *sink = NULL; pa_source *source = NULL; pa_sink_input *si = NULL; + pa_source_output *so = NULL; const char *name = NULL, *client_name; pa_native_connection_assert_ref(c); @@ -3513,9 +3827,7 @@ static void command_set_mute( CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name_or_wildcard(name, command == PA_COMMAND_SET_SINK_MUTE ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); switch (command) { @@ -3539,25 +3851,34 @@ static void command_set_mute( si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx); break; + case PA_COMMAND_SET_SOURCE_OUTPUT_MUTE: + so = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx); + break; + default: pa_assert_not_reached(); } - CHECK_VALIDITY(c->pstream, si || sink || source, tag, PA_ERR_NOENTITY); + CHECK_VALIDITY(c->pstream, si || so || sink || source, tag, PA_ERR_NOENTITY); client_name = pa_strnull(pa_proplist_gets(c->client->proplist, PA_PROP_APPLICATION_PROCESS_BINARY)); if (sink) { pa_log_debug("Client %s changes mute of sink %s.", client_name, sink->name); - pa_sink_set_mute(sink, mute, TRUE); + pa_sink_set_mute(sink, mute, true); } else if (source) { pa_log_debug("Client %s changes mute of source %s.", client_name, source->name); - pa_source_set_mute(source, mute, TRUE); + pa_source_set_mute(source, mute, true); } else if (si) { pa_log_debug("Client %s changes mute of sink input %s.", client_name, pa_strnull(pa_proplist_gets(si->proplist, PA_PROP_MEDIA_NAME))); - pa_sink_input_set_mute(si, mute, TRUE); + pa_sink_input_set_mute(si, mute, true); + } else if (so) { + pa_log_debug("Client %s changes mute of source output %s.", + client_name, + pa_strnull(pa_proplist_gets(so->proplist, PA_PROP_MEDIA_NAME))); + pa_source_output_set_mute(so, mute, true); } pa_pstream_send_simple_ack(c->pstream, tag); @@ -3566,7 +3887,7 @@ static void command_set_mute( static void command_cork_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); uint32_t idx; - pa_bool_t b; + bool b; playback_stream *s; pa_native_connection_assert_ref(c); @@ -3588,7 +3909,7 @@ static void command_cork_playback_stream(pa_pdispatch *pd, uint32_t command, uin pa_sink_input_cork(s->sink_input, b); if (b) - s->is_underrun = TRUE; + s->is_underrun = true; pa_pstream_send_simple_ack(c->pstream, tag); } @@ -3637,7 +3958,7 @@ static void command_cork_record_stream(pa_pdispatch *pd, uint32_t command, uint3 pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); uint32_t idx; record_stream *s; - pa_bool_t b; + bool b; pa_native_connection_assert_ref(c); pa_assert(t); @@ -3700,7 +4021,7 @@ static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, u if (command == PA_COMMAND_SET_PLAYBACK_STREAM_BUFFER_ATTR) { playback_stream *s; - pa_bool_t adjust_latency = FALSE, early_requests = FALSE; + bool adjust_latency = false, early_requests = false; s = pa_idxset_get_by_index(c->output_streams, idx); CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY); @@ -3722,7 +4043,7 @@ static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, u s->adjust_latency = adjust_latency; s->early_requests = early_requests; - s->buffer_attr = a; + s->buffer_attr_req = a; fix_playback_buffer_attr(s); pa_assert_se(pa_asyncmsgq_send(s->sink_input->sink->asyncmsgq, PA_MSGOBJECT(s->sink_input), SINK_INPUT_MESSAGE_UPDATE_BUFFER_ATTR, NULL, 0, NULL) == 0); @@ -3738,7 +4059,7 @@ static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, u } else { record_stream *s; - pa_bool_t adjust_latency = FALSE, early_requests = FALSE; + bool adjust_latency = false, early_requests = false; pa_assert(command == PA_COMMAND_SET_RECORD_STREAM_BUFFER_ATTR); s = pa_idxset_get_by_index(c->record_streams, idx); @@ -3758,7 +4079,7 @@ static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, u s->adjust_latency = adjust_latency; s->early_requests = early_requests; - s->buffer_attr = a; + s->buffer_attr_req = a; fix_record_buffer_attr_pre(s); pa_memblockq_set_maxlength(s->memblockq, s->buffer_attr.maxlength); @@ -3792,7 +4113,7 @@ static void command_update_stream_sample_rate(pa_pdispatch *pd, uint32_t command } CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); - CHECK_VALIDITY(c->pstream, rate > 0 && rate <= PA_RATE_MAX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, pa_sample_rate_valid(rate), tag, PA_ERR_INVALID); if (command == PA_COMMAND_UPDATE_PLAYBACK_STREAM_SAMPLE_RATE) { playback_stream *s; @@ -3853,7 +4174,7 @@ static void command_update_proplist(pa_pdispatch *pd, uint32_t command, uint32_t if (!(mode == PA_UPDATE_SET || mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE)) { pa_proplist_free(p); - CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, false, tag, PA_ERR_INVALID); } if (command == PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST) { @@ -3862,7 +4183,7 @@ static void command_update_proplist(pa_pdispatch *pd, uint32_t command, uint32_t s = pa_idxset_get_by_index(c->output_streams, idx); if (!s || !playback_stream_isinstance(s)) { pa_proplist_free(p); - CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY); + CHECK_VALIDITY(c->pstream, false, tag, PA_ERR_NOENTITY); } pa_sink_input_update_proplist(s->sink_input, mode, p); @@ -3871,7 +4192,7 @@ static void command_update_proplist(pa_pdispatch *pd, uint32_t command, uint32_t if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) { pa_proplist_free(p); - CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY); + CHECK_VALIDITY(c->pstream, false, tag, PA_ERR_NOENTITY); } pa_source_output_update_proplist(s->source_output, mode, p); @@ -4154,7 +4475,7 @@ static void command_unload_module(pa_pdispatch *pd, uint32_t command, uint32_t t m = pa_idxset_get_by_index(c->protocol->core->modules, idx); CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOENTITY); - pa_module_unload_request(m, FALSE); + pa_module_unload_request(m, false); pa_pstream_send_simple_ack(c->pstream, tag); } @@ -4178,9 +4499,7 @@ static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, !name_device || pa_namereg_is_valid_name_or_wildcard(name_device, command == PA_COMMAND_MOVE_SINK_INPUT ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx_device != PA_INVALID_INDEX || name_device, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx_device == PA_INVALID_INDEX || !name_device, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name_device || idx_device == PA_INVALID_INDEX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx_device != PA_INVALID_INDEX) ^ (name_device != NULL), tag, PA_ERR_INVALID); if (command == PA_COMMAND_MOVE_SINK_INPUT) { pa_sink_input *si = NULL; @@ -4195,7 +4514,7 @@ static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag CHECK_VALIDITY(c->pstream, si && sink, tag, PA_ERR_NOENTITY); - if (pa_sink_input_move_to(si, sink, TRUE) < 0) { + if (pa_sink_input_move_to(si, sink, true) < 0) { pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); return; } @@ -4214,7 +4533,7 @@ static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag CHECK_VALIDITY(c->pstream, so && source, tag, PA_ERR_NOENTITY); - if (pa_source_output_move_to(so, source, TRUE) < 0) { + if (pa_source_output_move_to(so, source, true) < 0) { pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); return; } @@ -4227,7 +4546,7 @@ static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); uint32_t idx = PA_INVALID_INDEX; const char *name = NULL; - pa_bool_t b; + bool b; pa_native_connection_assert_ref(c); pa_assert(t); @@ -4242,9 +4561,7 @@ static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name_or_wildcard(name, command == PA_COMMAND_SUSPEND_SINK ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE) || *name == 0, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); if (command == PA_COMMAND_SUSPEND_SINK) { @@ -4266,6 +4583,9 @@ static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY); + pa_log_debug("%s of sink %s requested by client %" PRIu32 ".", + b ? "Suspending" : "Resuming", sink->name, c->client->index); + if (pa_sink_suspend(sink, b, PA_SUSPEND_USER) < 0) { pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); return; @@ -4294,6 +4614,9 @@ static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa CHECK_VALIDITY(c->pstream, source, tag, PA_ERR_NOENTITY); + pa_log_debug("%s of source %s requested by client %" PRIu32 ".", + b ? "Suspending" : "Resuming", source->name, c->client->index); + if (pa_source_suspend(source, b, PA_SUSPEND_USER) < 0) { pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); return; @@ -4322,17 +4645,14 @@ static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_utf8_valid(name), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); if (idx != PA_INVALID_INDEX) m = pa_idxset_get_by_index(c->protocol->core->modules, idx); - else { - for (m = pa_idxset_first(c->protocol->core->modules, &idx); m; m = pa_idxset_next(c->protocol->core->modules, &idx)) - if (strcmp(name, m->name) == 0) + else + PA_IDXSET_FOREACH(m, c->protocol->core->modules, idx) + if (pa_streq(name, m->name)) break; - } CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION); CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID); @@ -4347,8 +4667,9 @@ static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); uint32_t idx = PA_INVALID_INDEX; - const char *name = NULL, *profile = NULL; + const char *name = NULL, *profile_name = NULL; pa_card *card = NULL; + pa_card_profile *profile; int ret; pa_native_connection_assert_ref(c); @@ -4356,7 +4677,7 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_ if (pa_tagstruct_getu32(t, &idx) < 0 || pa_tagstruct_gets(t, &name) < 0 || - pa_tagstruct_gets(t, &profile) < 0 || + pa_tagstruct_gets(t, &profile_name) < 0 || !pa_tagstruct_eof(t)) { protocol_error(c); return; @@ -4364,9 +4685,8 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_ CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, profile_name, tag, PA_ERR_INVALID); if (idx != PA_INVALID_INDEX) card = pa_idxset_get_by_index(c->protocol->core->cards, idx); @@ -4375,7 +4695,11 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_ CHECK_VALIDITY(c->pstream, card, tag, PA_ERR_NOENTITY); - if ((ret = pa_card_set_profile(card, profile, TRUE)) < 0) { + profile = pa_hashmap_get(card->profiles, profile_name); + + CHECK_VALIDITY(c->pstream, profile, tag, PA_ERR_NOENTITY); + + if ((ret = pa_card_set_profile(card, profile, true)) < 0) { pa_pstream_send_error(c->pstream, tag, -ret); return; } @@ -4402,9 +4726,8 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name_or_wildcard(name, command == PA_COMMAND_SET_SINK_PORT ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE), tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, port, tag, PA_ERR_INVALID); if (command == PA_COMMAND_SET_SINK_PORT) { pa_sink *sink; @@ -4416,14 +4739,14 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, CHECK_VALIDITY(c->pstream, sink, tag, PA_ERR_NOENTITY); - if ((ret = pa_sink_set_port(sink, port, TRUE)) < 0) { + if ((ret = pa_sink_set_port(sink, port, true)) < 0) { pa_pstream_send_error(c->pstream, tag, -ret); return; } } else { pa_source *source; - pa_assert(command = PA_COMMAND_SET_SOURCE_PORT); + pa_assert(command == PA_COMMAND_SET_SOURCE_PORT); if (idx != PA_INVALID_INDEX) source = pa_idxset_get_by_index(c->protocol->core->sources, idx); @@ -4432,7 +4755,7 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, CHECK_VALIDITY(c->pstream, source, tag, PA_ERR_NOENTITY); - if ((ret = pa_source_set_port(source, port, TRUE)) < 0) { + if ((ret = pa_source_set_port(source, port, true)) < 0) { pa_pstream_send_error(c->pstream, tag, -ret); return; } @@ -4441,6 +4764,46 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, pa_pstream_send_simple_ack(c->pstream, tag); } +static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { + pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); + const char *port_name, *card_name; + uint32_t idx = PA_INVALID_INDEX; + int64_t offset; + pa_card *card = NULL; + pa_device_port *port = NULL; + + pa_native_connection_assert_ref(c); + pa_assert(t); + + if (pa_tagstruct_getu32(t, &idx) < 0 || + pa_tagstruct_gets(t, &card_name) < 0 || + pa_tagstruct_gets(t, &port_name) < 0 || + pa_tagstruct_gets64(t, &offset) < 0 || + !pa_tagstruct_eof(t)) { + protocol_error(c); + return; + } + + CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); + CHECK_VALIDITY(c->pstream, !card_name || pa_namereg_is_valid_name(card_name), tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (card_name != NULL), tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, port_name, tag, PA_ERR_INVALID); + + if (idx != PA_INVALID_INDEX) + card = pa_idxset_get_by_index(c->protocol->core->cards, idx); + else + card = pa_namereg_get(c->protocol->core, card_name, PA_NAMEREG_CARD); + + CHECK_VALIDITY(c->pstream, card, tag, PA_ERR_NOENTITY); + + port = pa_hashmap_get(card->ports, port_name); + CHECK_VALIDITY(c->pstream, port, tag, PA_ERR_NOENTITY); + + pa_device_port_set_latency_offset(port, offset); + + pa_pstream_send_simple_ack(c->pstream, tag); +} + /*** pstream callbacks ***/ static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_creds *creds, void *userdata) { @@ -4470,7 +4833,9 @@ static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t o return; } -/* pa_log("got %lu bytes", (unsigned long) chunk->length); */ +#ifdef PROTOCOL_NATIVE_DEBUG + pa_log("got %lu bytes from client", (unsigned long) chunk->length); +#endif if (playback_stream_isinstance(stream)) { playback_stream *ps = PLAYBACK_STREAM(stream); @@ -4641,11 +5006,11 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati c->parent.process_msg = native_connection_process_msg; c->protocol = p; c->options = pa_native_options_ref(o); - c->authorized = FALSE; + c->authorized = false; if (o->auth_anonymous) { pa_log_info("Client authenticated anonymously."); - c->authorized = TRUE; + c->authorized = true; } if (!c->authorized && @@ -4653,7 +5018,7 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati pa_ip_acl_check(o->auth_ip_acl, pa_iochannel_get_recv_fd(io)) > 0) { pa_log_info("Client authenticated by IP ACL."); - c->authorized = TRUE; + c->authorized = true; } if (!c->authorized) @@ -4670,14 +5035,14 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati c->client->userdata = c; c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->mempool); - pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c); - pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c); + pa_pstream_set_receive_packet_callback(c->pstream, pstream_packet_callback, c); + pa_pstream_set_receive_memblock_callback(c->pstream, pstream_memblock_callback, c); pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c); pa_pstream_set_drain_callback(c->pstream, pstream_drain_callback, c); pa_pstream_set_revoke_callback(c->pstream, pstream_revoke_callback, c); pa_pstream_set_release_callback(c->pstream, pstream_release_callback, c); - c->pdispatch = pa_pdispatch_new(p->core->mainloop, TRUE, command_table, PA_COMMAND_MAX); + c->pdispatch = pa_pdispatch_new(p->core->mainloop, true, command_table, PA_COMMAND_MAX); c->record_streams = pa_idxset_new(NULL, NULL); c->output_streams = pa_idxset_new(NULL, NULL); @@ -4761,14 +5126,14 @@ void pa_native_protocol_unref(pa_native_protocol *p) { while ((c = pa_idxset_first(p->connections, NULL))) native_connection_unlink(c); - pa_idxset_free(p->connections, NULL, NULL); + pa_idxset_free(p->connections, NULL); pa_strlist_free(p->servers); for (h = 0; h < PA_NATIVE_HOOK_MAX; h++) pa_hook_done(&p->hooks[h]); - pa_hashmap_free(p->extensions, NULL, NULL); + pa_hashmap_free(p->extensions); pa_assert_se(pa_shared_remove(p->core, "native-protocol") >= 0); @@ -4865,7 +5230,7 @@ void pa_native_options_unref(pa_native_options *o) { } int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) { - pa_bool_t enabled; + bool enabled; const char *acl; pa_assert(o); @@ -4877,9 +5242,9 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) { return -1; } - enabled = TRUE; - if (pa_modargs_get_value_boolean(ma, "auth-group-enabled", &enabled) < 0) { - pa_log("auth-group-enabled= expects a boolean argument."); + enabled = true; + if (pa_modargs_get_value_boolean(ma, "auth-group-enable", &enabled) < 0) { + pa_log("auth-group-enable= expects a boolean argument."); return -1; } @@ -4905,7 +5270,7 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) { o->auth_ip_acl = ipa; } - enabled = TRUE; + enabled = true; if (pa_modargs_get_value_boolean(ma, "auth-cookie-enabled", &enabled) < 0) { pa_log("auth-cookie-enabled= expects a boolean argument."); return -1; @@ -4919,11 +5284,23 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) { /* The new name for this is 'auth-cookie', for compat reasons * we check the old name too */ - if (!(cn = pa_modargs_get_value(ma, "auth-cookie", NULL))) - if (!(cn = pa_modargs_get_value(ma, "cookie", NULL))) - cn = PA_NATIVE_COOKIE_FILE; + cn = pa_modargs_get_value(ma, "auth-cookie", NULL); + if (!cn) + cn = pa_modargs_get_value(ma, "cookie", NULL); + + if (cn) + o->auth_cookie = pa_auth_cookie_get(c, cn, true, PA_NATIVE_COOKIE_LENGTH); + else { + o->auth_cookie = pa_auth_cookie_get(c, PA_NATIVE_COOKIE_FILE, false, PA_NATIVE_COOKIE_LENGTH); + if (!o->auth_cookie) { + o->auth_cookie = pa_auth_cookie_get(c, PA_NATIVE_COOKIE_FILE_FALLBACK, false, PA_NATIVE_COOKIE_LENGTH); + + if (!o->auth_cookie) + o->auth_cookie = pa_auth_cookie_get(c, PA_NATIVE_COOKIE_FILE, true, PA_NATIVE_COOKIE_LENGTH); + } + } - if (!(o->auth_cookie = pa_auth_cookie_get(c, cn, PA_NATIVE_COOKIE_LENGTH))) + if (!o->auth_cookie) return -1; } else