summaryrefslogtreecommitdiffstats
path: root/src/modules/module-combine.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-03-25 00:42:32 +0100
committerLennart Poettering <lennart@poettering.net>2009-03-25 00:42:32 +0100
commitb815a1c7eb16e79b3b9ded80edda522202ad25f9 (patch)
treec62439232b3233fb85e8ea55f8d85570f2ea231e /src/modules/module-combine.c
parent0316dba9d1bb519259076f580869cf65147bde44 (diff)
don't fiddle with latency range because we cannot adjust it dynamically
Diffstat (limited to 'src/modules/module-combine.c')
-rw-r--r--src/modules/module-combine.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index f72223d9..b7e18bc3 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -69,7 +69,7 @@ PA_MODULE_USAGE(
#define DEFAULT_ADJUST_TIME 10
-#define REQUEST_LATENCY_USEC (PA_USEC_PER_MSEC * 200)
+#define BLOCK_USEC (PA_USEC_PER_MSEC * 200)
static const char* const valid_modargs[] = {
"sink_name",
@@ -817,7 +817,7 @@ static int output_create_sink_input(struct output *o) {
o->sink_input->kill = sink_input_kill_cb;
o->sink_input->userdata = o;
- pa_sink_input_set_requested_latency(o->sink_input, REQUEST_LATENCY_USEC);
+ pa_sink_input_set_requested_latency(o->sink_input, BLOCK_USEC);
return 0;
}
@@ -1088,11 +1088,8 @@ int pa__init(pa_module*m) {
pa_sink_set_rtpoll(u->sink, u->rtpoll);
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
- pa_sink_set_latency_range(u->sink, REQUEST_LATENCY_USEC, REQUEST_LATENCY_USEC);
- u->block_usec = u->sink->thread_info.max_latency;
-
- u->sink->thread_info.max_request =
- pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec);
+ u->block_usec = BLOCK_USEC;
+ pa_sink_set_max_request(u->sink, pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec));
if (!u->automatic) {
const char*split_state;