diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-12-12 22:58:53 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-12-12 22:58:53 +0000 |
| commit | e02be6c15beddec976220bce2ee1a68520286c01 (patch) | |
| tree | da9cfdfd7a254fa7e8e21b1ef29456b852dbc133 /polyp/module-combine.c | |
| parent | 9a01cf44f09e92e14a720f4f531e943a50f26b72 (diff) | |
* fix include file names in installed header files
* add browsing API
* add new tool pabrowse
* add typeid subsystem
* bump API version
* split off random.c
* add an identification cookie
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@320 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/module-combine.c')
| -rw-r--r-- | polyp/module-combine.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/polyp/module-combine.c b/polyp/module-combine.c index 7b3c26dd..ca79d7df 100644 --- a/polyp/module-combine.c +++ b/polyp/module-combine.c @@ -43,6 +43,8 @@ PA_MODULE_DESCRIPTION("Combine multiple sinks to one") PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_USAGE("sink_name=<name for the sink> master=<master sink> slaves=<slave sinks> adjust_time=<seconds> resample_method=<method>") +#define PA_TYPEID_COMBINE PA_TYPEID_MAKE('C', 'M', 'B', 'N') + #define DEFAULT_SINK_NAME "combined" #define MEMBLOCKQ_MAXLENGTH (1024*170) #define RENDER_SIZE (1024*10) @@ -214,7 +216,7 @@ static struct output *output_new(struct userdata *u, struct pa_sink *sink, int r o->memblockq = pa_memblockq_new(MEMBLOCKQ_MAXLENGTH, MEMBLOCKQ_MAXLENGTH, pa_frame_size(&u->sink->sample_spec), 0, 0, sink->core->memblock_stat); snprintf(t, sizeof(t), "%s: output #%u", u->sink->name, u->n_outputs+1); - if (!(o->sink_input = pa_sink_input_new(sink, t, &u->sink->sample_spec, 1, resample_method))) + if (!(o->sink_input = pa_sink_input_new(sink, PA_TYPEID_COMBINE, t, &u->sink->sample_spec, 1, resample_method))) goto fail; o->sink_input->get_latency = sink_input_get_latency_cb; @@ -325,7 +327,7 @@ int pa__init(struct pa_core *c, struct pa_module*m) { goto fail; } - if (!(u->sink = pa_sink_new(c, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &master_sink->sample_spec))) { + if (!(u->sink = pa_sink_new(c, PA_TYPEID_COMBINE, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &master_sink->sample_spec))) { pa_log(__FILE__": failed to create sink\n"); goto fail; } |