← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/modules/module-protocol-stub.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-protocol-stub.c
1
 
/* $Id: module-protocol-stub.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: module-protocol-stub.c 2043 2007-11-09 18:25:40Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
76
76
  #else
77
77
    #include "module-simple-protocol-unix-symdef.h"
78
78
  #endif
79
 
  PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION)
 
79
PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION);
80
80
  PA_MODULE_USAGE("rate=<sample rate> "
81
81
                  "format=<sample format> "
82
82
                  "channels=<number of channels> "
84
84
                  "source=<source to connect to> "
85
85
                  "playback=<enable playback?> "
86
86
                  "record=<enable record?> "
87
 
                  SOCKET_USAGE)
 
87
                  SOCKET_USAGE);
88
88
#elif defined(USE_PROTOCOL_CLI)
89
89
  #include <pulsecore/protocol-cli.h>
90
90
  #define protocol_new pa_protocol_cli_new
98
98
  #else
99
99
    #include "module-cli-protocol-unix-symdef.h"
100
100
  #endif
101
 
  PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION)
102
 
  PA_MODULE_USAGE(SOCKET_USAGE)
 
101
  PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION);
 
102
  PA_MODULE_USAGE(SOCKET_USAGE);
103
103
#elif defined(USE_PROTOCOL_HTTP)
104
104
  #include <pulsecore/protocol-http.h>
105
105
  #define protocol_new pa_protocol_http_new
113
113
  #else
114
114
    #include "module-http-protocol-unix-symdef.h"
115
115
  #endif
116
 
  PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION)
117
 
  PA_MODULE_USAGE(SOCKET_USAGE)
 
116
  PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION);
 
117
  PA_MODULE_USAGE(SOCKET_USAGE);
118
118
#elif defined(USE_PROTOCOL_NATIVE)
119
119
  #include <pulsecore/protocol-native.h>
120
120
  #define protocol_new pa_protocol_native_new
140
140
    #define AUTH_USAGE
141
141
  #endif
142
142
 
143
 
  PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION)
 
143
  PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION);
144
144
  PA_MODULE_USAGE("auth-anonymous=<don't check for cookies?> "
145
145
                  "cookie=<path to cookie file> "
146
146
                  AUTH_USAGE
147
 
                  SOCKET_USAGE)
 
147
                  SOCKET_USAGE);
148
148
#elif defined(USE_PROTOCOL_ESOUND)
149
149
  #include <pulsecore/protocol-esound.h>
150
150
  #include <pulsecore/esound.h>
167
167
    #define AUTH_USAGE
168
168
  #endif
169
169
 
170
 
  PA_MODULE_DESCRIPTION("ESOUND protocol "SOCKET_DESCRIPTION)
 
170
  PA_MODULE_DESCRIPTION("ESOUND protocol "SOCKET_DESCRIPTION);
171
171
  PA_MODULE_USAGE("sink=<sink to connect to> "
172
172
                  "source=<source to connect to> "
173
173
                  "auth-anonymous=<don't verify cookies?> "
174
174
                  "cookie=<path to cookie file> "
175
175
                  AUTH_USAGE
176
 
                  SOCKET_USAGE)
 
176
                  SOCKET_USAGE);
177
177
#else
178
178
  #error "Broken build system"
179
179
#endif
180
180
 
181
 
PA_MODULE_AUTHOR("Lennart Poettering")
182
 
PA_MODULE_VERSION(PACKAGE_VERSION)
 
181
PA_MODULE_LOAD_ONCE(FALSE);
 
182
PA_MODULE_AUTHOR("Lennart Poettering");
 
183
PA_MODULE_VERSION(PACKAGE_VERSION);
183
184
 
184
185
static const char* const valid_modargs[] = {
185
186
    MODULE_ARGUMENTS