← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/modules/module-hal-detect.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-hal-detect.c
1
 
/* $Id: module-hal-detect.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: module-hal-detect.c 2050 2007-11-13 17:37:44Z lennart $ */
2
2
 
3
3
/***
4
4
    This file is part of PulseAudio.
53
53
#include "dbus-util.h"
54
54
#include "module-hal-detect-symdef.h"
55
55
 
56
 
PA_MODULE_AUTHOR("Shahms King")
57
 
PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers")
58
 
PA_MODULE_VERSION(PACKAGE_VERSION)
 
56
PA_MODULE_AUTHOR("Shahms King");
 
57
PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers");
 
58
PA_MODULE_VERSION(PACKAGE_VERSION);
 
59
PA_MODULE_LOAD_ONCE(TRUE);
59
60
#if defined(HAVE_ALSA) && defined(HAVE_OSS)
60
 
PA_MODULE_USAGE("api=<alsa or oss>")
 
61
PA_MODULE_USAGE("api=<alsa or oss>");
61
62
#elif defined(HAVE_ALSA)
62
 
PA_MODULE_USAGE("api=<alsa>")
 
63
PA_MODULE_USAGE("api=<alsa>");
63
64
#elif defined(HAVE_OSS)
64
 
PA_MODULE_USAGE("api=<oss>")
 
65
PA_MODULE_USAGE("api=<oss>");
65
66
#endif
66
67
 
67
68
struct device {
190
191
        *sink_name = pa_sprintf_malloc("alsa_output.%s", strip_udi(udi));
191
192
 
192
193
        module_name = "module-alsa-sink";
193
 
        args = pa_sprintf_malloc("device=hw:%u sink_name=%s", card, *sink_name);
 
194
        args = pa_sprintf_malloc("device_id=%u sink_name=%s", card, *sink_name);
194
195
    } else {
195
196
        *source_name = pa_sprintf_malloc("alsa_input.%s", strip_udi(udi));
196
197
 
197
198
        module_name = "module-alsa-source";
198
 
        args = pa_sprintf_malloc("device=hw:%u source_name=%s", card, *source_name);
 
199
        args = pa_sprintf_malloc("device_id=%u source_name=%s", card, *source_name);
199
200
    }
200
201
 
201
202
    pa_log_debug("Loading %s with arguments '%s'", module_name, args);