diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-02-24 00:26:07 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-02-24 00:26:07 +0100 |
| commit | fb49399a0cf8c6e42f4c3f25dbe4753add4251f8 (patch) | |
| tree | 5021f45bb2e6dddeb71ebd5af21d2921e060910a | |
| parent | c73887d2295c02b284ddc9650174eb56582675a8 (diff) | |
| parent | 2a0d2522e00d4402346d97e2f3b650de413c4fdb (diff) | |
Merge commit 'coling/master'
| -rw-r--r-- | libpulse.pc.in | 1 | ||||
| -rw-r--r-- | src/modules/module-raop-discover.c | 6 | ||||
| -rw-r--r-- | src/modules/module-raop-sink.c | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/libpulse.pc.in b/libpulse.pc.in index 161599e1..c78b1231 100644 --- a/libpulse.pc.in +++ b/libpulse.pc.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +modlibexecdir=@modlibexecdir@ Name: libpulse Description: PulseAudio Client Interface diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c index 3706d921..df393151 100644 --- a/src/modules/module-raop-discover.c +++ b/src/modules/module-raop-discover.c @@ -53,7 +53,7 @@ #include "module-raop-discover-symdef.h" PA_MODULE_AUTHOR("Colin Guthrie"); -PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Discovery of Airtunes"); +PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Discovery of RAOP devices"); PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(TRUE); @@ -172,9 +172,9 @@ static void resolver_cb( } if (device) - dname = pa_sprintf_malloc("airtunes.%s.%s", host_name, device); + dname = pa_sprintf_malloc("raop.%s.%s", host_name, device); else - dname = pa_sprintf_malloc("airtunes.%s", host_name); + dname = pa_sprintf_malloc("raop.%s", host_name); if (!(vname = pa_namereg_make_valid_name(dname))) { pa_log("Cannot construct valid device name from '%s'.", dname); diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c index 1784b2cc..da338f5d 100644 --- a/src/modules/module-raop-sink.c +++ b/src/modules/module-raop-sink.c @@ -67,7 +67,7 @@ #include "raop_client.h" PA_MODULE_AUTHOR("Colin Guthrie"); -PA_MODULE_DESCRIPTION("RAOP Sink (Apple Airtunes)"); +PA_MODULE_DESCRIPTION("RAOP Sink"); PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(FALSE); PA_MODULE_USAGE( @@ -77,7 +77,7 @@ PA_MODULE_USAGE( "channels=<number of channels> " "rate=<sample rate>"); -#define DEFAULT_SINK_NAME "airtunes" +#define DEFAULT_SINK_NAME "raop" struct userdata { pa_core *core; @@ -564,7 +564,7 @@ int pa__init(pa_module*m) { pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME)); pa_sink_new_data_set_sample_spec(&data, &ss); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, server); - pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Airtunes sink '%s'", server); + pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "RAOP sink '%s'", server); u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY|PA_SINK_NETWORK); pa_sink_new_data_done(&data); |