← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/pulseaudio/oneiric

« back to all changes in this revision

Viewing changes to src/modules/module-combine.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2007-12-04 00:56:08 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071204005608-y1xqvcu45g1yxtlu
Tags: 0.9.8-1ubuntu1
"Hail our new PulseAudio overlords (part two)."

* Merge from Debian unstable.
* Ubuntu-specific changes:
  - debian/control:
    + Don't build-depend on libjack0.100.0-dev or build jack module
      packages,
    + Update pulseaudio's Recommends and Suggests to accomodate
      existing promoted main packages,
    + Explicitly mention pasuspender in pulseaudio-utils's long
      description,
    + Add Vcs-Bzr URI,
    + Adhere to DebianMaintainerField;
  - debian/rules: Use multiuser for update-rc.d;
  - debian/patches/series: Retain the exclusion of
    0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch.
* Dropped Ubuntu-specific change (absorbed into Debian source):
  debian/patches/0002-Double-esound-maximum-sample-size.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/module-combine.c
1
 
/* $Id: module-combine.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: module-combine.c 2043 2007-11-09 18:25:40Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
50
50
 
51
51
#include "module-combine-symdef.h"
52
52
 
53
 
PA_MODULE_AUTHOR("Lennart Poettering")
54
 
PA_MODULE_DESCRIPTION("Combine multiple sinks to one")
55
 
PA_MODULE_VERSION(PACKAGE_VERSION)
 
53
PA_MODULE_AUTHOR("Lennart Poettering");
 
54
PA_MODULE_DESCRIPTION("Combine multiple sinks to one");
 
55
PA_MODULE_VERSION(PACKAGE_VERSION);
 
56
PA_MODULE_LOAD_ONCE(FALSE);
56
57
PA_MODULE_USAGE(
57
58
        "sink_name=<name for the sink> "
58
59
        "master=<master sink> "
62
63
        "format=<sample format> "
63
64
        "channels=<number of channels> "
64
65
        "rate=<sample rate> "
65
 
        "channel_map=<channel map>")
 
66
        "channel_map=<channel map>");
66
67
 
67
68
#define DEFAULT_SINK_NAME "combined"
68
69
#define MEMBLOCKQ_MAXLENGTH (1024*170)
233
234
 
234
235
    pa_log_debug("Thread starting up");
235
236
 
236
 
    if (u->core->high_priority)
237
 
        pa_make_realtime();
 
237
    if (u->core->realtime_scheduling)
 
238
        pa_make_realtime(u->core->realtime_priority+1);
238
239
 
239
240
    pa_thread_mq_install(&u->thread_mq);
240
241
    pa_rtpoll_install(u->rtpoll);