[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test2-122-gfb49399

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  9372733c9864836d118abe92f9136614ccc7f449 (commit)

- Log -----------------------------------------------------------------
fb49399... Merge commit 'coling/master'
c73887d... update gitignore
2a0d252... Add the module dir to the libpulse pkgconfig file (needed for paprefs)
4ebc6cf... Remove references to trademarked terms.
-----------------------------------------------------------------------

Summary of changes:
 libpulse.pc.in                     |    1 +
 po/.gitignore                      |    1 +
 src/.gitignore                     |    1 +
 src/daemon/.gitignore              |    2 ++
 src/modules/module-raop-discover.c |    6 +++---
 src/modules/module-raop-sink.c     |    6 +++---
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 src/daemon/.gitignore

-----------------------------------------------------------------------

commit 4ebc6cf86ed9e0f5ddc7bc20ef1e5f5e98a16d43
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Sun Feb 22 16:08:43 2009 +0000

    Remove references to trademarked terms.
    
    According to http://www.apple.com/legal/trademark/appletmlist.html we could run into
    problems for using these terms without also displaying a corresponding disclaimer/attribution
    notice. This is difficult in the context of a headless server, so simply don't use such terms.
    
    In GUI apps which can enable this functionality we should use the relevant terminology, and
    display the appropriate attribution notices.

diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 3706d92..df39315 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 1784b2c..da338f5 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);

commit 2a0d2522e00d4402346d97e2f3b650de413c4fdb
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Sun Feb 22 16:36:16 2009 +0000

    Add the module dir to the libpulse pkgconfig file (needed for paprefs)

diff --git a/libpulse.pc.in b/libpulse.pc.in
index 161599e..c78b123 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

commit c73887d2295c02b284ddc9650174eb56582675a8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 24 00:24:31 2009 +0100

    update gitignore

diff --git a/po/.gitignore b/po/.gitignore
index 2691982..9a0243a 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,3 +1,4 @@
+.intltool-merge-cache
 Makefile.in.in
 Makevars.template
 POTFILES
diff --git a/src/.gitignore b/src/.gitignore
index 4da445b..80d33d3 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,4 @@
+alsa-time-test
 gtk-test
 prioq-test
 lock-autospawn-test
diff --git a/src/daemon/.gitignore b/src/daemon/.gitignore
new file mode 100644
index 0000000..0efa55b
--- /dev/null
+++ b/src/daemon/.gitignore
@@ -0,0 +1,2 @@
+org.pulseaudio.policy
+pulseaudio.desktop

commit fb49399a0cf8c6e42f4c3f25dbe4753add4251f8
Merge: c73887d... 2a0d252...
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 24 00:26:07 2009 +0100

    Merge commit 'coling/master'


-- 
hooks/post-receive
PulseAudio Sound Server