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

- fix suspend handling

Browse source 
- set sink description properly
- honour resample_method setting


git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1735 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-31 00:22:31 +00:00
parent 241ad047c8
commit f59dd18fe6
1 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/modules/module-combine.c
View file

@ -462,9 +462,12 @@ static int suspend(struct userdata *u) {
/* Let's suspend by unlinking all streams */ /* Let's suspend by unlinking all streams */
for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx)) { for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx)) {
pa_sink_input_unlink(o->sink_input);
pa_sink_input_unref(o->sink_input); if (o->sink_input) {
o->sink_input = NULL; pa_sink_input_unlink(o->sink_input);
pa_sink_input_unref(o->sink_input);
o->sink_input = NULL;
}
} }
if (pick_master(u) < 0) if (pick_master(u) < 0)
@ -484,11 +487,15 @@ static int unsuspend(struct userdata *u) {
/* Let's resume */ /* Let's resume */
for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx)) { for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx)) {
if (output_create_sink_input(u, o) < 0) pa_sink_suspend(o->sink, 0);
output_free(o);
else if (PA_SINK_OPENED(pa_sink_get_state(o->sink))) {
pa_sink_input_put(o->sink_input); if (output_create_sink_input(u, o) < 0)
output_free(o);
else
pa_sink_input_put(o->sink_input);
}
} }
if (pick_master(u) < 0) if (pick_master(u) < 0)
@ -765,7 +772,8 @@ static int output_create_sink_input(struct userdata *u, struct output *o) {
pa_sink_input_new_data_set_sample_spec(&data, &u->sink->sample_spec); pa_sink_input_new_data_set_sample_spec(&data, &u->sink->sample_spec);
pa_sink_input_new_data_set_channel_map(&data, &u->sink->channel_map); pa_sink_input_new_data_set_channel_map(&data, &u->sink->channel_map);
data.module = u->module; data.module = u->module;
data.resample_method = u->resample_method;
o->sink_input = pa_sink_input_new(u->core, &data, PA_SINK_INPUT_VARIABLE_RATE|PA_SINK_INPUT_DONT_MOVE); o->sink_input = pa_sink_input_new(u->core, &data, PA_SINK_INPUT_VARIABLE_RATE|PA_SINK_INPUT_DONT_MOVE);
pa_xfree(t); pa_xfree(t);
@ -785,7 +793,7 @@ static int output_create_sink_input(struct userdata *u, struct output *o) {
return 0; return 0;
} }
static struct output *output_new(struct userdata *u, pa_sink *sink, int resample_method) { static struct output *output_new(struct userdata *u, pa_sink *sink) {
struct output *o; struct output *o;
pa_assert(u); pa_assert(u);
@ -808,17 +816,22 @@ static struct output *output_new(struct userdata *u, pa_sink *sink, int resample
NULL); NULL);
pa_assert_se(pa_idxset_put(u->outputs, o, NULL) == 0);
update_description(u); update_description(u);
pa_assert_se(pa_idxset_put(u->outputs, o, NULL) == 0);
if (u->sink && PA_SINK_LINKED(pa_sink_get_state(u->sink))) if (u->sink && PA_SINK_LINKED(pa_sink_get_state(u->sink)))
pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_ADD_OUTPUT, o, 0, NULL); pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_ADD_OUTPUT, o, 0, NULL);
else else
PA_LLIST_PREPEND(struct output, u->thread_info.outputs, o); PA_LLIST_PREPEND(struct output, u->thread_info.outputs, o);
if (PA_SINK_OPENED(pa_sink_get_state(sink))) if (PA_SINK_OPENED(pa_sink_get_state(u->sink)) || pa_sink_get_state(u->sink) == PA_SINK_INIT) {
if (output_create_sink_input(u, o) < 0) pa_sink_suspend(sink, 0);
goto fail;
if (PA_SINK_OPENED(pa_sink_get_state(sink)))
if (output_create_sink_input(u, o) < 0)
goto fail;
}
return o; return o;
@ -855,7 +868,7 @@ static pa_hook_result_t sink_new_hook_cb(pa_core *c, pa_sink *s, struct userdata
pa_log_info("Configuring new sink: %s", s->name); pa_log_info("Configuring new sink: %s", s->name);
if (!(o = output_new(u, s, u->resample_method))) { if (!(o = output_new(u, s))) {
pa_log("Failed to create sink input on sink '%s'.", s->name); pa_log("Failed to create sink input on sink '%s'.", s->name);
return PA_HOOK_OK; return PA_HOOK_OK;
} }
@ -914,7 +927,7 @@ static pa_hook_result_t sink_state_changed_hook_cb(pa_core *c, pa_sink *s, struc
state = pa_sink_get_state(s); state = pa_sink_get_state(s);
if (PA_SINK_OPENED(state) && !o->sink_input) { if (PA_SINK_OPENED(state) && PA_SINK_OPENED(pa_sink_get_state(u->sink)) && !o->sink_input) {
output_create_sink_input(u, o); output_create_sink_input(u, o);
if (pick_master(u) < 0) if (pick_master(u) < 0)
@ -943,7 +956,7 @@ int pa__init(pa_module*m) {
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
const char *master_name, *slaves, *rm; const char *master_name, *slaves, *rm;
pa_sink *master_sink = NULL; pa_sink *master_sink = NULL;
int resample_method = -1; int resample_method = PA_RESAMPLER_TRIVIAL;
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
struct output *o; struct output *o;
@ -1051,7 +1064,7 @@ int pa__init(pa_module*m) {
/* The master and slaves have been specified manually */ /* The master and slaves have been specified manually */
if (!(u->master = output_new(u, master_sink, resample_method))) { if (!(u->master = output_new(u, master_sink))) {
pa_log("Failed to create master sink input on sink '%s'.", master_sink->name); pa_log("Failed to create master sink input on sink '%s'.", master_sink->name);
goto fail; goto fail;
} }
@ -1068,7 +1081,7 @@ int pa__init(pa_module*m) {
pa_xfree(n); pa_xfree(n);
if (!output_new(u, slave_sink, resample_method)) { if (!output_new(u, slave_sink)) {
pa_log("Failed to create slave sink input on sink '%s'.", slave_sink->name); pa_log("Failed to create slave sink input on sink '%s'.", slave_sink->name);
goto fail; goto fail;
} }
@ -1090,7 +1103,7 @@ int pa__init(pa_module*m) {
if (!(s->flags & PA_SINK_HARDWARE) || s == u->sink) if (!(s->flags & PA_SINK_HARDWARE) || s == u->sink)
continue; continue;
if (!output_new(u, s, resample_method)) { if (!output_new(u, s)) {
pa_log("Failed to create sink input on sink '%s'.", s->name); pa_log("Failed to create sink input on sink '%s'.", s->name);
goto fail; goto fail;
} }
@ -1104,12 +1117,14 @@ int pa__init(pa_module*m) {
if (pick_master(u) < 0) if (pick_master(u) < 0)
goto fail; goto fail;
/* Activate the sink and the sink inputs */ /* Activate the sink and the sink inputs */
pa_sink_put(u->sink); pa_sink_put(u->sink);
for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx))
pa_sink_input_put(o->sink_input);
for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx))
if (o->sink_input)
pa_sink_input_put(o->sink_input);
if (u->adjust_time > 0) { if (u->adjust_time > 0) {
struct timeval tv; struct timeval tv;
pa_gettimeofday(&tv); pa_gettimeofday(&tv);