← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/modules/module-jack-source.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-jack-source.c
1
 
/* $Id: module-jack-source.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: module-jack-source.c 2056 2007-11-14 16:09:03Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
54
54
/* See module-jack-sink for a few comments how this module basically
55
55
 * works */
56
56
 
57
 
PA_MODULE_AUTHOR("Lennart Poettering")
58
 
PA_MODULE_DESCRIPTION("JACK Source")
59
 
PA_MODULE_VERSION(PACKAGE_VERSION)
 
57
PA_MODULE_AUTHOR("Lennart Poettering");
 
58
PA_MODULE_DESCRIPTION("JACK Source");
 
59
PA_MODULE_VERSION(PACKAGE_VERSION);
 
60
PA_MODULE_LOAD_ONCE(TRUE);
60
61
PA_MODULE_USAGE(
61
62
        "source_name=<name of source> "
62
63
        "server_name=<jack server name> "
63
64
        "client_name=<jack client name> "
64
65
        "channels=<number of channels> "
65
66
        "connect=<connect ports?>"
66
 
        "channel_map=<channel map>")
 
67
        "channel_map=<channel map>");
67
68
 
68
69
#define DEFAULT_SOURCE_NAME "jack_in"
69
70
 
191
192
 
192
193
    pa_log_debug("Thread starting up");
193
194
 
194
 
    if (u->core->high_priority)
195
 
        pa_make_realtime();
 
195
    if (u->core->realtime_scheduling)
 
196
        pa_make_realtime(u->core->realtime_priority);
196
197
 
197
198
    pa_thread_mq_install(&u->thread_mq);
198
199
    pa_rtpoll_install(u->rtpoll);
230
231
 
231
232
    pa_log_info("JACK thread starting up.");
232
233
 
233
 
    if (u->core->high_priority)
234
 
        pa_make_realtime();
 
234
    if (u->core->realtime_scheduling)
 
235
        pa_make_realtime(u->core->realtime_priority+4);
235
236
}
236
237
 
237
238
static void jack_shutdown(void* arg) {
249
250
    jack_status_t status;
250
251
    const char *server_name, *client_name;
251
252
    uint32_t channels = 0;
252
 
    int do_connect = 1;
 
253
    pa_bool_t do_connect = TRUE;
253
254
    unsigned i;
254
255
    const char **ports = NULL, **p;
255
256
    char *t;