mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'coling/master'

Browse source
This commit is contained in:
Lennart Poettering 2009-02-24 00:26:07 +01:00
commit fb49399a0c
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libpulse.pc.in
View file

@ -2,6 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
modlibexecdir=@modlibexecdir@
Name: libpulse Name: libpulse
Description: PulseAudio Client Interface Description: PulseAudio Client Interface

6
src/modules/module-raop-discover.c
View file

@ -53,7 +53,7 @@
#include "module-raop-discover-symdef.h" #include "module-raop-discover-symdef.h"
PA_MODULE_AUTHOR("Colin Guthrie"); 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_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE); PA_MODULE_LOAD_ONCE(TRUE);
@ -172,9 +172,9 @@ static void resolver_cb(
} }
if (device) if (device)
dname = pa_sprintf_malloc("airtunes.%s.%s", host_name, device); dname = pa_sprintf_malloc("raop.%s.%s", host_name, device);
else 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))) { if (!(vname = pa_namereg_make_valid_name(dname))) {
pa_log("Cannot construct valid device name from '%s'.", dname); pa_log("Cannot construct valid device name from '%s'.", dname);

6
src/modules/module-raop-sink.c
View file

@ -67,7 +67,7 @@
#include "raop_client.h" #include "raop_client.h"
PA_MODULE_AUTHOR("Colin Guthrie"); PA_MODULE_AUTHOR("Colin Guthrie");
PA_MODULE_DESCRIPTION("RAOP Sink (Apple Airtunes)"); PA_MODULE_DESCRIPTION("RAOP Sink");
PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(FALSE); PA_MODULE_LOAD_ONCE(FALSE);
PA_MODULE_USAGE( PA_MODULE_USAGE(
@ -77,7 +77,7 @@ PA_MODULE_USAGE(
"channels=<number of channels> " "channels=<number of channels> "
"rate=<sample rate>"); "rate=<sample rate>");
#define DEFAULT_SINK_NAME "airtunes" #define DEFAULT_SINK_NAME "raop"
struct userdata { struct userdata {
pa_core *core; 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_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME));
pa_sink_new_data_set_sample_spec(&data, &ss); pa_sink_new_data_set_sample_spec(&data, &ss);
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, server); 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); u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY|PA_SINK_NETWORK);
pa_sink_new_data_done(&data); pa_sink_new_data_done(&data);