mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink, source: Support creating suspended sinks and sources

Browse source 
The initial state of a sink or source might not necessarily be IDLE,
because sometimes it might be suspended from the very beginning.
This commit is contained in:
Mikel Astiz 2012-08-31 12:51:00 +02:00 • committed by Arun Raghavan
parent 0ee5fa6377
commit f280e8b50d
5 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -381,7 +381,9 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
case PA_SINK_SUSPENDED:
pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));
/* Ignore if transition is PA_SINK_INIT->PA_SINK_SUSPENDED */
if (!PA_SINK_IS_OPENED(u->sink->thread_info.state))
break;
/* Stop the device if the source is suspended as well */
if (!u->source || u->source->state == PA_SOURCE_SUSPENDED)
@ -455,7 +457,9 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) {
case PA_SOURCE_SUSPENDED:
pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state));
/* Ignore if transition is PA_SOURCE_INIT->PA_SOURCE_SUSPENDED */
if (!PA_SOURCE_IS_OPENED(u->source->thread_info.state))
break;
/* Stop the device if the sink is suspended as well */
if (!u->sink || u->sink->state == PA_SINK_SUSPENDED)

7
src/pulsecore/sink.c
View file

@ -248,7 +248,7 @@ pa_sink* pa_sink_new(
s->state = PA_SINK_INIT;
s->flags = flags;
s->priority = 0;
s->suspend_cause = 0;
s->suspend_cause = data->suspend_cause;
pa_sink_set_mixer_dirty(s, FALSE);
s->name = pa_xstrdup(name);
s->proplist = pa_proplist_copy(data->proplist);
@ -650,7 +650,10 @@ void pa_sink_put(pa_sink* s) {
pa_assert(s->monitor_source->thread_info.min_latency == s->thread_info.min_latency);
pa_assert(s->monitor_source->thread_info.max_latency == s->thread_info.max_latency);
pa_assert_se(sink_set_state(s, PA_SINK_IDLE) == 0);
if (s->suspend_cause)
pa_assert_se(sink_set_state(s, PA_SINK_SUSPENDED) == 0);
else
pa_assert_se(sink_set_state(s, PA_SINK_IDLE) == 0);
pa_source_put(s->monitor_source);

2
src/pulsecore/sink.h
View file

@ -328,6 +328,8 @@ typedef enum pa_sink_message {
} pa_sink_message_t;
typedef struct pa_sink_new_data {
pa_suspend_cause_t suspend_cause;
char *name;
pa_proplist *proplist;

7
src/pulsecore/source.c
View file

@ -235,7 +235,7 @@ pa_source* pa_source_new(
s->state = PA_SOURCE_INIT;
s->flags = flags;
s->priority = 0;
s->suspend_cause = 0;
s->suspend_cause = data->suspend_cause;
pa_source_set_mixer_dirty(s, FALSE);
s->name = pa_xstrdup(name);
s->proplist = pa_proplist_copy(data->proplist);
@ -595,7 +595,10 @@ void pa_source_put(pa_source *s) {
pa_assert(!(s->flags & PA_SOURCE_DECIBEL_VOLUME) || s->n_volume_steps == PA_VOLUME_NORM+1);
pa_assert(!(s->flags & PA_SOURCE_DYNAMIC_LATENCY) == (s->thread_info.fixed_latency != 0));
pa_assert_se(source_set_state(s, PA_SOURCE_IDLE) == 0);
if (s->suspend_cause)
pa_assert_se(source_set_state(s, PA_SOURCE_SUSPENDED) == 0);
else
pa_assert_se(source_set_state(s, PA_SOURCE_IDLE) == 0);
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE | PA_SUBSCRIPTION_EVENT_NEW, s->index);
pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SOURCE_PUT], s);

2
src/pulsecore/source.h
View file

@ -265,6 +265,8 @@ typedef enum pa_source_message {
} pa_source_message_t;
typedef struct pa_source_new_data {
pa_suspend_cause_t suspend_cause;
char *name;
pa_proplist *proplist;