mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* add new state changed hook for streams

Browse source 
* update sink->n_corked properly when moving streams


git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1900 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-24 23:31:22 +00:00
parent ac86fa1b97
commit f0f9df9990
3 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pulsecore/core.h
View file

@ -60,6 +60,7 @@ typedef enum pa_core_hook {
PA_CORE_HOOK_SINK_INPUT_MOVE, PA_CORE_HOOK_SINK_INPUT_MOVE,
PA_CORE_HOOK_SINK_INPUT_MOVE_POST, PA_CORE_HOOK_SINK_INPUT_MOVE_POST,
PA_CORE_HOOK_SINK_INPUT_NAME_CHANGED, PA_CORE_HOOK_SINK_INPUT_NAME_CHANGED,
PA_CORE_HOOK_SINK_INPUT_STATE_CHANGED,
PA_CORE_HOOK_SOURCE_OUTPUT_NEW, PA_CORE_HOOK_SOURCE_OUTPUT_NEW,
PA_CORE_HOOK_SOURCE_OUTPUT_PUT, PA_CORE_HOOK_SOURCE_OUTPUT_PUT,
PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK, PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK,
@ -67,6 +68,7 @@ typedef enum pa_core_hook {
PA_CORE_HOOK_SOURCE_OUTPUT_MOVE, PA_CORE_HOOK_SOURCE_OUTPUT_MOVE,
PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_POST, PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_POST,
PA_CORE_HOOK_SOURCE_OUTPUT_NAME_CHANGED, PA_CORE_HOOK_SOURCE_OUTPUT_NAME_CHANGED,
PA_CORE_HOOK_SOURCE_OUTPUT_STATE_CHANGED,
PA_CORE_HOOK_MAX PA_CORE_HOOK_MAX
} pa_core_hook_t; } pa_core_hook_t;

8
src/pulsecore/sink-input.c
View file

@ -262,6 +262,9 @@ static int sink_input_set_state(pa_sink_input *i, pa_sink_input_state_t state) {
ssync->state = state; ssync->state = state;
} }
if (state != PA_SINK_INPUT_UNLINKED)
pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_STATE_CHANGED], i);
return 0; return 0;
} }
@ -825,6 +828,11 @@ int pa_sink_input_move_to(pa_sink_input *i, pa_sink *dest, int immediately) {
pa_idxset_put(dest->inputs, i, NULL); pa_idxset_put(dest->inputs, i, NULL);
i->sink = dest; i->sink = dest;
if (pa_sink_input_get_state(i) == PA_SINK_INPUT_CORKED) {
pa_assert_se(origin->n_corked-- >= 1);
dest->n_corked++;
}
/* Replace resampler */ /* Replace resampler */
if (new_resampler != i->thread_info.resampler) { if (new_resampler != i->thread_info.resampler) {
if (i->thread_info.resampler) if (i->thread_info.resampler)

8
src/pulsecore/source-output.c
View file

@ -192,6 +192,9 @@ static int source_output_set_state(pa_source_output *o, pa_source_output_state_t
o->state = state; o->state = state;
if (state != PA_SOURCE_OUTPUT_UNLINKED)
pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_STATE_CHANGED], o);
return 0; return 0;
} }
@ -427,6 +430,11 @@ int pa_source_output_move_to(pa_source_output *o, pa_source *dest) {
pa_idxset_put(dest->outputs, o, NULL); pa_idxset_put(dest->outputs, o, NULL);
o->source = dest; o->source = dest;
if (pa_source_output_get_state(o) == PA_SOURCE_OUTPUT_CORKED) {
pa_assert_se(origin->n_corked-- >= 1);
dest->n_corked++;
}
/* Replace resampler */ /* Replace resampler */
if (new_resampler != o->thread_info.resampler) { if (new_resampler != o->thread_info.resampler) {
if (o->thread_info.resampler) if (o->thread_info.resampler)