tag modules that may only be loaded once at most especially, and enforce that in the module loader

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2043 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-11-09 18:25:40 +00:00
parent d8e0c1c6bd
commit e313fe1b3d
42 changed files with 233 additions and 160 deletions

View file

@ -71,6 +71,7 @@ static void long_info(const char *name, const char *path, pa_modinfo *i) {
printf("Author: %s\n", i->author); printf("Author: %s\n", i->author);
if (i->usage) if (i->usage)
printf("Usage: %s\n", i->usage); printf("Usage: %s\n", i->usage);
printf("Load Once: %s\n", pa_yes_no(i->load_once));
} }
if (path) if (path)

View file

@ -53,10 +53,10 @@
#include "module-gconf-symdef.h" #include "module-gconf-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("GConf Adapter") PA_MODULE_DESCRIPTION("GConf Adapter");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("") PA_MODULE_LOAD_ONCE(TRUE);
#define MAX_MODULES 10 #define MAX_MODULES 10
#define BUF_MAX 2048 #define BUF_MAX 2048

View file

@ -50,9 +50,10 @@
#include "alsa-util.h" #include "alsa-util.h"
#include "module-alsa-sink-symdef.h" #include "module-alsa-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("ALSA Sink") PA_MODULE_DESCRIPTION("ALSA Sink");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"device=<ALSA device> " "device=<ALSA device> "
@ -62,7 +63,7 @@ PA_MODULE_USAGE(
"fragments=<number of fragments> " "fragments=<number of fragments> "
"fragment_size=<fragment size> " "fragment_size=<fragment size> "
"channel_map=<channel map> " "channel_map=<channel map> "
"mmap=<enable memory mapping?>") "mmap=<enable memory mapping?>");
#define DEFAULT_DEVICE "default" #define DEFAULT_DEVICE "default"

View file

@ -51,9 +51,10 @@
#include "alsa-util.h" #include "alsa-util.h"
#include "module-alsa-source-symdef.h" #include "module-alsa-source-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("ALSA Source") PA_MODULE_DESCRIPTION("ALSA Source");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"source_name=<name for the source> " "source_name=<name for the source> "
"device=<ALSA device> " "device=<ALSA device> "
@ -63,7 +64,7 @@ PA_MODULE_USAGE(
"fragments=<number of fragments> " "fragments=<number of fragments> "
"fragment_size=<fragment size> " "fragment_size=<fragment size> "
"channel_map=<channel map> " "channel_map=<channel map> "
"mmap=<enable memory mapping?>") "mmap=<enable memory mapping?>");
#define DEFAULT_DEVICE "default" #define DEFAULT_DEVICE "default"

View file

@ -38,10 +38,11 @@
#include "module-cli-symdef.h" #include "module-cli-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Command line interface") PA_MODULE_DESCRIPTION("Command line interface");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("exit_on_eof=<exit daemon after EOF?>") PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE("exit_on_eof=<exit daemon after EOF?>");
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"exit_on_eof", "exit_on_eof",

View file

@ -50,9 +50,10 @@
#include "module-combine-symdef.h" #include "module-combine-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Combine multiple sinks to one") PA_MODULE_DESCRIPTION("Combine multiple sinks to one");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"master=<master sink> " "master=<master sink> "
@ -62,7 +63,7 @@ PA_MODULE_USAGE(
"format=<sample format> " "format=<sample format> "
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate> " "rate=<sample rate> "
"channel_map=<channel map>") "channel_map=<channel map>");
#define DEFAULT_SINK_NAME "combined" #define DEFAULT_SINK_NAME "combined"
#define MEMBLOCKQ_MAXLENGTH (1024*170) #define MEMBLOCKQ_MAXLENGTH (1024*170)

View file

@ -32,9 +32,10 @@
#include "module-default-device-restore-symdef.h" #include "module-default-device-restore-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Automatically restore the default sink and source") PA_MODULE_DESCRIPTION("Automatically restore the default sink and source");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
#define DEFAULT_SINK_FILE "default-sink" #define DEFAULT_SINK_FILE "default-sink"
#define DEFAULT_SOURCE_FILE "default-source" #define DEFAULT_SOURCE_FILE "default-source"
@ -98,6 +99,3 @@ void pa__done(pa_module*m) {
fclose(f); fclose(f);
} }
} }

View file

@ -10,6 +10,7 @@ define(`gen_symbol', `#define $1 'module_name`_LTX_$1')dnl
#include <pulsecore/core.h> #include <pulsecore/core.h>
#include <pulsecore/module.h> #include <pulsecore/module.h>
#include <pulsecore/macro.h>
gen_symbol(pa__init) gen_symbol(pa__init)
gen_symbol(pa__done) gen_symbol(pa__done)
@ -17,6 +18,7 @@ gen_symbol(pa__get_author)
gen_symbol(pa__get_description) gen_symbol(pa__get_description)
gen_symbol(pa__get_usage) gen_symbol(pa__get_usage)
gen_symbol(pa__get_version) gen_symbol(pa__get_version)
gen_symbol(pa__load_once)
int pa__init(pa_module*m); int pa__init(pa_module*m);
void pa__done(pa_module*m); void pa__done(pa_module*m);
@ -25,5 +27,6 @@ const char* pa__get_author(void);
const char* pa__get_description(void); const char* pa__get_description(void);
const char* pa__get_usage(void); const char* pa__get_usage(void);
const char* pa__get_version(void); const char* pa__get_version(void);
pa_bool_t pa__load_once(void);
#endif #endif

View file

@ -47,10 +47,11 @@
#include "module-detect-symdef.h" #include "module-detect-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers") PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("just-one=<boolean>") PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE("just-one=<boolean>");
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"just-one", "just-one",

View file

@ -37,10 +37,11 @@
#include "module-esound-compat-spawnfd-symdef.h" #include "module-esound-compat-spawnfd-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnfd emulation") PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnfd emulation");
PA_MODULE_USAGE("fd=<file descriptor>") PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("fd=<file descriptor>");
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"fd", "fd",

View file

@ -37,10 +37,11 @@
#include "module-esound-compat-spawnpid-symdef.h" #include "module-esound-compat-spawnpid-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnpid emulation") PA_MODULE_DESCRIPTION("ESOUND compatibility module: -spawnpid emulation");
PA_MODULE_USAGE("pid=<process id>") PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE("pid=<process id>");
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"pid", "pid",

View file

@ -64,15 +64,16 @@
#include "module-esound-sink-symdef.h" #include "module-esound-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("ESOUND Sink") PA_MODULE_DESCRIPTION("ESOUND Sink");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"server=<address> cookie=<filename> " "server=<address> cookie=<filename> "
"format=<sample format> " "format=<sample format> "
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate>") "rate=<sample rate>");
#define DEFAULT_SINK_NAME "esound_out" #define DEFAULT_SINK_NAME "esound_out"

View file

@ -53,15 +53,16 @@
#include "dbus-util.h" #include "dbus-util.h"
#include "module-hal-detect-symdef.h" #include "module-hal-detect-symdef.h"
PA_MODULE_AUTHOR("Shahms King") PA_MODULE_AUTHOR("Shahms King");
PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers") PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
#if defined(HAVE_ALSA) && defined(HAVE_OSS) #if defined(HAVE_ALSA) && defined(HAVE_OSS)
PA_MODULE_USAGE("api=<alsa or oss>") PA_MODULE_USAGE("api=<alsa or oss>");
#elif defined(HAVE_ALSA) #elif defined(HAVE_ALSA)
PA_MODULE_USAGE("api=<alsa>") PA_MODULE_USAGE("api=<alsa>");
#elif defined(HAVE_OSS) #elif defined(HAVE_OSS)
PA_MODULE_USAGE("api=<oss>") PA_MODULE_USAGE("api=<oss>");
#endif #endif
struct device { struct device {

View file

@ -64,16 +64,17 @@
* source support in JACK. * source support in JACK.
*/ */
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("JACK Sink") PA_MODULE_DESCRIPTION("JACK Sink");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name of sink> " "sink_name=<name of sink> "
"server_name=<jack server name> " "server_name=<jack server name> "
"client_name=<jack client name> " "client_name=<jack client name> "
"channels=<number of channels> " "channels=<number of channels> "
"connect=<connect ports?> " "connect=<connect ports?> "
"channel_map=<channel map>") "channel_map=<channel map>");
#define DEFAULT_SINK_NAME "jack_out" #define DEFAULT_SINK_NAME "jack_out"

View file

@ -54,16 +54,17 @@
/* See module-jack-sink for a few comments how this module basically /* See module-jack-sink for a few comments how this module basically
* works */ * works */
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("JACK Source") PA_MODULE_DESCRIPTION("JACK Source");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"source_name=<name of source> " "source_name=<name of source> "
"server_name=<jack server name> " "server_name=<jack server name> "
"client_name=<jack client name> " "client_name=<jack client name> "
"channels=<number of channels> " "channels=<number of channels> "
"connect=<connect ports?>" "connect=<connect ports?>"
"channel_map=<channel map>") "channel_map=<channel map>");
#define DEFAULT_SOURCE_NAME "jack_in" #define DEFAULT_SOURCE_NAME "jack_in"

View file

@ -45,9 +45,10 @@
#include "module-ladspa-sink-symdef.h" #include "module-ladspa-sink-symdef.h"
#include "ladspa.h" #include "ladspa.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Virtual LADSPA sink") PA_MODULE_DESCRIPTION("Virtual LADSPA sink");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"master=<name of sink to remap> " "master=<name of sink to remap> "
@ -57,7 +58,7 @@ PA_MODULE_USAGE(
"channel_map=<channel map> " "channel_map=<channel map> "
"plugin=<ladspa plugin name> " "plugin=<ladspa plugin name> "
"label=<ladspa plugin label> " "label=<ladspa plugin label> "
"control=<comma seperated list of input control values>") "control=<comma seperated list of input control values>");
struct userdata { struct userdata {
pa_core *core; pa_core *core;

View file

@ -43,10 +43,11 @@
#include "module-lirc-symdef.h" #include "module-lirc-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("LIRC volume control") PA_MODULE_DESCRIPTION("LIRC volume control");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("config=<config file> sink=<sink name> appname=<lirc application name>") PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE("config=<config file> sink=<sink name> appname=<lirc application name>");
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"config", "config",

View file

@ -46,10 +46,11 @@
#include "module-match-symdef.h" #include "module-match-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Playback stream expression matching module") PA_MODULE_DESCRIPTION("Playback stream expression matching module");
PA_MODULE_USAGE("table=<filename>") PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE("table=<filename>");
#define WHITESPACE "\n\r \t" #define WHITESPACE "\n\r \t"
@ -241,5 +242,3 @@ void pa__done(pa_module*m) {
pa_xfree(u); pa_xfree(u);
} }

View file

@ -46,10 +46,11 @@
#include "module-mmkbd-evdev-symdef.h" #include "module-mmkbd-evdev-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Multimedia keyboard support via Linux evdev") PA_MODULE_DESCRIPTION("Multimedia keyboard support via Linux evdev");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("device=<evdev device> sink=<sink name>") PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE("device=<evdev device> sink=<sink name>");
#define DEFAULT_DEVICE "/dev/input/event0" #define DEFAULT_DEVICE "/dev/input/event0"

View file

@ -37,9 +37,10 @@
#include "module-native-protocol-fd-symdef.h" #include "module-native-protocol-fd-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Native protocol autospawn helper") PA_MODULE_DESCRIPTION("Native protocol autospawn helper");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"fd", "fd",

View file

@ -51,16 +51,17 @@
#include "module-null-sink-symdef.h" #include "module-null-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Clocked NULL sink") PA_MODULE_DESCRIPTION("Clocked NULL sink");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"format=<sample format> " "format=<sample format> "
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate> " "rate=<sample rate> "
"sink_name=<name of sink>" "sink_name=<name of sink>"
"channel_map=<channel map>" "channel_map=<channel map>"
"description=<description for the sink>") "description=<description for the sink>");
#define DEFAULT_SINK_NAME "null" #define DEFAULT_SINK_NAME "null"

View file

@ -76,9 +76,10 @@
#include "oss-util.h" #include "oss-util.h"
#include "module-oss-symdef.h" #include "module-oss-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("OSS Sink/Source") PA_MODULE_DESCRIPTION("OSS Sink/Source");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"source_name=<name for the source> " "source_name=<name for the source> "
@ -91,7 +92,7 @@ PA_MODULE_USAGE(
"fragments=<number of fragments> " "fragments=<number of fragments> "
"fragment_size=<fragment size> " "fragment_size=<fragment size> "
"channel_map=<channel map> " "channel_map=<channel map> "
"mmap=<enable memory mapping?>") "mmap=<enable memory mapping?>");
#define DEFAULT_DEVICE "/dev/dsp" #define DEFAULT_DEVICE "/dev/dsp"

View file

@ -50,16 +50,17 @@
#include "module-pipe-sink-symdef.h" #include "module-pipe-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("UNIX pipe sink") PA_MODULE_DESCRIPTION("UNIX pipe sink");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"file=<path of the FIFO> " "file=<path of the FIFO> "
"format=<sample format> " "format=<sample format> "
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate>" "rate=<sample rate>"
"channel_map=<channel map>") "channel_map=<channel map>");
#define DEFAULT_FILE_NAME "/tmp/music.output" #define DEFAULT_FILE_NAME "/tmp/music.output"
#define DEFAULT_SINK_NAME "fifo_output" #define DEFAULT_SINK_NAME "fifo_output"

View file

@ -49,16 +49,17 @@
#include "module-pipe-source-symdef.h" #include "module-pipe-source-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("UNIX pipe source") PA_MODULE_DESCRIPTION("UNIX pipe source");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"source_name=<name for the source> " "source_name=<name for the source> "
"file=<path of the FIFO> " "file=<path of the FIFO> "
"format=<sample format> " "format=<sample format> "
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate> " "rate=<sample rate> "
"channel_map=<channel map>") "channel_map=<channel map>");
#define DEFAULT_FILE_NAME "/tmp/music.input" #define DEFAULT_FILE_NAME "/tmp/music.input"
#define DEFAULT_SOURCE_NAME "fifo_input" #define DEFAULT_SOURCE_NAME "fifo_input"

View file

@ -76,7 +76,7 @@
#else #else
#include "module-simple-protocol-unix-symdef.h" #include "module-simple-protocol-unix-symdef.h"
#endif #endif
PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION) PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION);
PA_MODULE_USAGE("rate=<sample rate> " PA_MODULE_USAGE("rate=<sample rate> "
"format=<sample format> " "format=<sample format> "
"channels=<number of channels> " "channels=<number of channels> "
@ -84,7 +84,7 @@
"source=<source to connect to> " "source=<source to connect to> "
"playback=<enable playback?> " "playback=<enable playback?> "
"record=<enable record?> " "record=<enable record?> "
SOCKET_USAGE) SOCKET_USAGE);
#elif defined(USE_PROTOCOL_CLI) #elif defined(USE_PROTOCOL_CLI)
#include <pulsecore/protocol-cli.h> #include <pulsecore/protocol-cli.h>
#define protocol_new pa_protocol_cli_new #define protocol_new pa_protocol_cli_new
@ -98,8 +98,8 @@
#else #else
#include "module-cli-protocol-unix-symdef.h" #include "module-cli-protocol-unix-symdef.h"
#endif #endif
PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION) PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION);
PA_MODULE_USAGE(SOCKET_USAGE) PA_MODULE_USAGE(SOCKET_USAGE);
#elif defined(USE_PROTOCOL_HTTP) #elif defined(USE_PROTOCOL_HTTP)
#include <pulsecore/protocol-http.h> #include <pulsecore/protocol-http.h>
#define protocol_new pa_protocol_http_new #define protocol_new pa_protocol_http_new
@ -113,8 +113,8 @@
#else #else
#include "module-http-protocol-unix-symdef.h" #include "module-http-protocol-unix-symdef.h"
#endif #endif
PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION) PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION);
PA_MODULE_USAGE(SOCKET_USAGE) PA_MODULE_USAGE(SOCKET_USAGE);
#elif defined(USE_PROTOCOL_NATIVE) #elif defined(USE_PROTOCOL_NATIVE)
#include <pulsecore/protocol-native.h> #include <pulsecore/protocol-native.h>
#define protocol_new pa_protocol_native_new #define protocol_new pa_protocol_native_new
@ -140,11 +140,11 @@
#define AUTH_USAGE #define AUTH_USAGE
#endif #endif
PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION) PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION);
PA_MODULE_USAGE("auth-anonymous=<don't check for cookies?> " PA_MODULE_USAGE("auth-anonymous=<don't check for cookies?> "
"cookie=<path to cookie file> " "cookie=<path to cookie file> "
AUTH_USAGE AUTH_USAGE
SOCKET_USAGE) SOCKET_USAGE);
#elif defined(USE_PROTOCOL_ESOUND) #elif defined(USE_PROTOCOL_ESOUND)
#include <pulsecore/protocol-esound.h> #include <pulsecore/protocol-esound.h>
#include <pulsecore/esound.h> #include <pulsecore/esound.h>
@ -167,19 +167,20 @@
#define AUTH_USAGE #define AUTH_USAGE
#endif #endif
PA_MODULE_DESCRIPTION("ESOUND protocol "SOCKET_DESCRIPTION) PA_MODULE_DESCRIPTION("ESOUND protocol "SOCKET_DESCRIPTION);
PA_MODULE_USAGE("sink=<sink to connect to> " PA_MODULE_USAGE("sink=<sink to connect to> "
"source=<source to connect to> " "source=<source to connect to> "
"auth-anonymous=<don't verify cookies?> " "auth-anonymous=<don't verify cookies?> "
"cookie=<path to cookie file> " "cookie=<path to cookie file> "
AUTH_USAGE AUTH_USAGE
SOCKET_USAGE) SOCKET_USAGE);
#else #else
#error "Broken build system" #error "Broken build system"
#endif #endif
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_VERSION(PACKAGE_VERSION);
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
MODULE_ARGUMENTS MODULE_ARGUMENTS

View file

@ -40,9 +40,10 @@
#include "module-remap-sink-symdef.h" #include "module-remap-sink-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Virtual channel remapping sink") PA_MODULE_DESCRIPTION("Virtual channel remapping sink");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"master=<name of sink to remap> " "master=<name of sink to remap> "
@ -50,7 +51,7 @@ PA_MODULE_USAGE(
"format=<sample format> " "format=<sample format> "
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate> " "rate=<sample rate> "
"channel_map=<channel map>") "channel_map=<channel map>");
struct userdata { struct userdata {
pa_core *core; pa_core *core;

View file

@ -36,9 +36,10 @@
#include "module-rescue-streams-symdef.h" #include "module-rescue-streams-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("When a sink/source is removed, try to move their streams to the default sink/source") PA_MODULE_DESCRIPTION("When a sink/source is removed, try to move their streams to the default sink/source");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
NULL, NULL,

View file

@ -39,10 +39,11 @@
#include "module-sine-symdef.h" #include "module-sine-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Sine wave generator") PA_MODULE_DESCRIPTION("Sine wave generator");
PA_MODULE_USAGE("sink=<sink to connect to> frequency=<frequency in Hz>") PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE("sink=<sink to connect to> frequency=<frequency in Hz>");
struct userdata { struct userdata {
pa_core *core; pa_core *core;
@ -203,4 +204,3 @@ void pa__done(pa_module*m) {
pa_xfree(u); pa_xfree(u);
} }

View file

@ -37,9 +37,10 @@
#include "module-suspend-on-idle-symdef.h" #include "module-suspend-on-idle-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("When a sink/source is idle for too long, suspend it") PA_MODULE_DESCRIPTION("When a sink/source is idle for too long, suspend it");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"timeout", "timeout",

View file

@ -59,7 +59,8 @@
#ifdef TUNNEL_SINK #ifdef TUNNEL_SINK
#include "module-tunnel-sink-symdef.h" #include "module-tunnel-sink-symdef.h"
PA_MODULE_DESCRIPTION("Tunnel module for sinks") PA_MODULE_DESCRIPTION("Tunnel module for sinks");
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"server=<address> " "server=<address> "
"sink=<remote sink name> " "sink=<remote sink name> "
@ -68,10 +69,10 @@ PA_MODULE_USAGE(
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate> " "rate=<sample rate> "
"sink_name=<name for the local sink> " "sink_name=<name for the local sink> "
"channel_map=<channel map>") "channel_map=<channel map>");
#else #else
#include "module-tunnel-source-symdef.h" #include "module-tunnel-source-symdef.h"
PA_MODULE_DESCRIPTION("Tunnel module for sources") PA_MODULE_DESCRIPTION("Tunnel module for sources");
PA_MODULE_USAGE( PA_MODULE_USAGE(
"server=<address> " "server=<address> "
"source=<remote source name> " "source=<remote source name> "
@ -80,11 +81,11 @@ PA_MODULE_USAGE(
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate> " "rate=<sample rate> "
"source_name=<name for the local source> " "source_name=<name for the local source> "
"channel_map=<channel map>") "channel_map=<channel map>");
#endif #endif
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
#define DEFAULT_TLENGTH_MSEC 100 #define DEFAULT_TLENGTH_MSEC 100
#define DEFAULT_MINREQ_MSEC 10 #define DEFAULT_MINREQ_MSEC 10

View file

@ -48,10 +48,11 @@
#include "module-volume-restore-symdef.h" #include "module-volume-restore-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Automatically restore the volume and the devices of streams") PA_MODULE_DESCRIPTION("Automatically restore the volume and the devices of streams");
PA_MODULE_USAGE("table=<filename>") PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE("table=<filename>");
#define WHITESPACE "\n\r \t" #define WHITESPACE "\n\r \t"

View file

@ -44,10 +44,11 @@
#include "module-x11-bell-symdef.h" #include "module-x11-bell-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("X11 Bell interceptor") PA_MODULE_DESCRIPTION("X11 Bell interceptor");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("sink=<sink to connect to> sample=<sample name> display=<X11 display>") PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE("sink=<sink to connect to> sample=<sample name> display=<X11 display>");
struct userdata { struct userdata {
pa_core *core; pa_core *core;

View file

@ -53,10 +53,11 @@
#include "module-x11-publish-symdef.h" #include "module-x11-publish-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("X11 Credential Publisher") PA_MODULE_DESCRIPTION("X11 Credential Publisher");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("display=<X11 display>") PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE("display=<X11 display>");
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"display", "display",

View file

@ -45,9 +45,10 @@
#include "module-x11-xsmp-symdef.h" #include "module-x11-xsmp-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("X11 session management") PA_MODULE_DESCRIPTION("X11 session management");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
static int ice_in_use = 0; static int ice_in_use = 0;

View file

@ -53,9 +53,10 @@
#include "module-zeroconf-discover-symdef.h" #include "module-zeroconf-discover-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Discovery") PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Discovery");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE);
#define SERVICE_TYPE_SINK "_pulse-sink._tcp" #define SERVICE_TYPE_SINK "_pulse-sink._tcp"
#define SERVICE_TYPE_SOURCE "_non-monitor._sub._pulse-source._tcp" #define SERVICE_TYPE_SOURCE "_non-monitor._sub._pulse-source._tcp"

View file

@ -52,10 +52,11 @@
#include "module-zeroconf-publish-symdef.h" #include "module-zeroconf-publish-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Publisher") PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Publisher");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("port=<IP port number>") PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE("port=<IP port number>");
#define SERVICE_TYPE_SINK "_pulse-sink._tcp" #define SERVICE_TYPE_SINK "_pulse-sink._tcp"
#define SERVICE_TYPE_SOURCE "_pulse-source._tcp" #define SERVICE_TYPE_SOURCE "_pulse-source._tcp"

View file

@ -58,13 +58,14 @@
#include "sdp.h" #include "sdp.h"
#include "sap.h" #include "sap.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Recieve data from a network via RTP/SAP/SDP") PA_MODULE_DESCRIPTION("Recieve data from a network via RTP/SAP/SDP");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink=<name of the sink> " "sink=<name of the sink> "
"sap_address=<multicast address to listen on> " "sap_address=<multicast address to listen on> "
) );
#define SAP_PORT 9875 #define SAP_PORT 9875
#define DEFAULT_SAP_ADDRESS "224.0.0.56" #define DEFAULT_SAP_ADDRESS "224.0.0.56"

View file

@ -57,9 +57,10 @@
#include "sdp.h" #include "sdp.h"
#include "sap.h" #include "sap.h"
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Read data from source and send it to the network via RTP/SAP/SDP") PA_MODULE_DESCRIPTION("Read data from source and send it to the network via RTP/SAP/SDP");
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"source=<name of the source> " "source=<name of the source> "
"format=<sample format> " "format=<sample format> "
@ -69,7 +70,7 @@ PA_MODULE_USAGE(
"port=<port number> " "port=<port number> "
"mtu=<maximum transfer unit> " "mtu=<maximum transfer unit> "
"loop=<loopback to local host?>" "loop=<loopback to local host?>"
) );
#define DEFAULT_PORT 46000 #define DEFAULT_PORT 46000
#define SAP_PORT 9875 #define SAP_PORT 9875

View file

@ -40,10 +40,12 @@
#define PA_SYMBOL_DESCRIPTION "pa__get_description" #define PA_SYMBOL_DESCRIPTION "pa__get_description"
#define PA_SYMBOL_USAGE "pa__get_usage" #define PA_SYMBOL_USAGE "pa__get_usage"
#define PA_SYMBOL_VERSION "pa__get_version" #define PA_SYMBOL_VERSION "pa__get_version"
#define PA_SYMBOL_LOAD_ONCE "pa__load_once"
pa_modinfo *pa_modinfo_get_by_handle(lt_dlhandle dl, const char *module_name) { pa_modinfo *pa_modinfo_get_by_handle(lt_dlhandle dl, const char *module_name) {
pa_modinfo *i; pa_modinfo *i;
const char* (*func)(void); const char* (*func)(void);
pa_bool_t (*func2) (void);
pa_assert(dl); pa_assert(dl);
@ -61,6 +63,9 @@ pa_modinfo *pa_modinfo_get_by_handle(lt_dlhandle dl, const char *module_name) {
if ((func = (const char* (*)(void)) pa_load_sym(dl, module_name, PA_SYMBOL_VERSION))) if ((func = (const char* (*)(void)) pa_load_sym(dl, module_name, PA_SYMBOL_VERSION)))
i->version = pa_xstrdup(func()); i->version = pa_xstrdup(func());
if ((func2 = (pa_bool_t (*)(void)) pa_load_sym(dl, module_name, PA_SYMBOL_LOAD_ONCE)))
i->load_once = func2();
return i; return i;
} }

View file

@ -25,12 +25,14 @@
***/ ***/
/* Some functions for reading module meta data from PulseAudio modules */ /* Some functions for reading module meta data from PulseAudio modules */
#include <pulsecore/macro.h>
typedef struct pa_modinfo { typedef struct pa_modinfo {
char *author; char *author;
char *description; char *description;
char *usage; char *usage;
char *version; char *version;
pa_bool_t load_once;
} pa_modinfo; } pa_modinfo;
/* Read meta data from an libtool handle */ /* Read meta data from an libtool handle */

View file

@ -46,6 +46,7 @@
#define PA_SYMBOL_INIT "pa__init" #define PA_SYMBOL_INIT "pa__init"
#define PA_SYMBOL_DONE "pa__done" #define PA_SYMBOL_DONE "pa__done"
#define PA_SYMBOL_LOAD_ONCE "pa__load_once"
#define UNLOAD_POLL_TIME 2 #define UNLOAD_POLL_TIME 2
@ -66,6 +67,7 @@ static void timeout_callback(pa_mainloop_api *m, pa_time_event*e, PA_GCC_UNUSED
pa_module* pa_module_load(pa_core *c, const char *name, const char *argument) { pa_module* pa_module_load(pa_core *c, const char *name, const char *argument) {
pa_module *m = NULL; pa_module *m = NULL;
pa_bool_t (*load_once)(void);
pa_assert(c); pa_assert(c);
pa_assert(name); pa_assert(name);
@ -82,6 +84,22 @@ pa_module* pa_module_load(pa_core *c, const char *name, const char *argument) {
goto fail; goto fail;
} }
if ((load_once = (pa_bool_t (*)(void)) pa_load_sym(m->dl, name, PA_SYMBOL_LOAD_ONCE))) {
if (load_once()) {
pa_module *i;
uint32_t idx;
/* OK, the module only wants to be loaded once, let's make sure it is */
for (i = pa_idxset_first(c->modules, &idx); i; i = pa_idxset_next(c->modules, &idx)) {
if (strcmp(name, i->name) == 0) {
pa_log("Module \"%s\" should be loaded once at most. Refusing to load.", name);
goto fail;
}
}
}
}
if (!(m->init = (int (*)(pa_module*_m)) pa_load_sym(m->dl, name, PA_SYMBOL_INIT))) { if (!(m->init = (int (*)(pa_module*_m)) pa_load_sym(m->dl, name, PA_SYMBOL_INIT))) {
pa_log("Failed to load module \"%s\": symbol \""PA_SYMBOL_INIT"\" not found.", name); pa_log("Failed to load module \"%s\": symbol \""PA_SYMBOL_INIT"\" not found.", name);
goto fail; goto fail;

View file

@ -62,10 +62,25 @@ void pa_module_unload_request(pa_module *m);
void pa_module_set_used(pa_module*m, int used); void pa_module_set_used(pa_module*m, int used);
#define PA_MODULE_AUTHOR(s) const char *pa__get_author(void) { return s; } #define PA_MODULE_AUTHOR(s) \
#define PA_MODULE_DESCRIPTION(s) const char *pa__get_description(void) { return s; } const char *pa__get_author(void) { return s; } \
#define PA_MODULE_USAGE(s) const char *pa__get_usage(void) { return s; } struct __stupid_useless_struct_to_allow_trailing_semicolon
#define PA_MODULE_VERSION(s) const char * pa__get_version(void) { return s; }
#define PA_MODULE_DESCRIPTION(s) \
const char *pa__get_description(void) { return s; } \
struct __stupid_useless_struct_to_allow_trailing_semicolon
#define PA_MODULE_USAGE(s) \
const char *pa__get_usage(void) { return s; } \
struct __stupid_useless_struct_to_allow_trailing_semicolon
#define PA_MODULE_VERSION(s) \
const char * pa__get_version(void) { return s; } \
struct __stupid_useless_struct_to_allow_trailing_semicolon
#define PA_MODULE_LOAD_ONCE(b) \
pa_bool_t pa__load_once(void) { return b; } \
struct __stupid_useless_struct_to_allow_trailing_semicolon
pa_modinfo *pa_module_get_info(pa_module *m); pa_modinfo *pa_module_get_info(pa_module *m);