[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-614-g948950a

[Colin Guthrie]

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  148a90e48226877c72206a929bad09cdf04664b1 (commit)

- Log -----------------------------------------------------------------
948950a module-bonjour-publish: don't include avahi headers
af18bc8 alsa-source: fix enum types
c72d878 alsa-mixer: make a few strings translatable
6c66c05 pulse: make sure legacy_dir is not static
-----------------------------------------------------------------------

Summary of changes:
 src/modules/alsa/alsa-mixer.c        |    6 +++---
 src/modules/alsa/alsa-source.c       |    4 ++--
 src/modules/module-bonjour-publish.c |    1 -
 src/pulse/context.c                  |    2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

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

commit 6c66c0585e45e943681d9f12e116b0ce691a421d
Author: Jan Kratochvil <jan.kratochvil at redhat.com>
Date:   Thu Nov 25 03:49:27 2010 +0100

    pulse: make sure legacy_dir is not static

diff --git a/src/pulse/context.c b/src/pulse/context.c
index 8875bfd..7a539b4 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -624,7 +624,7 @@ static pa_strlist *prepend_per_user(pa_strlist *l) {
     char *ufn;
 
 #ifdef ENABLE_LEGACY_RUNTIME_DIR
-    static char *legacy_dir;
+    char *legacy_dir;
 
     /* The very old per-user instance path (< 0.9.11). This is supported only to ease upgrades */
     if ((legacy_dir = get_very_old_legacy_runtime_dir())) {

commit c72d8789139257528114ca11baa341ec2783eaea
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 25 04:03:56 2010 +0100

    alsa-mixer: make a few strings translatable
    
    Original patch contributed by 'kelemeng'
    
    http://pulseaudio.org/ticket/843

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 23b22d0..b3ec57e 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -62,7 +62,7 @@ static const char *lookup_description(const char *name, const struct description
 
     for (i = 0; i < n; i++)
         if (pa_streq(dm[i].name, name))
-            return dm[i].description;
+            return _(dm[i].description);
 
     return NULL;
 }
@@ -3137,7 +3137,7 @@ static int profile_verify(pa_alsa_profile *p) {
                 if (!pa_strbuf_isempty(sb))
                     pa_strbuf_puts(sb, " + ");
 
-                pa_strbuf_printf(sb, "%s Output", m->description);
+                pa_strbuf_printf(sb, _("%s Output"), m->description);
             }
 
         if (p->input_mappings)
@@ -3145,7 +3145,7 @@ static int profile_verify(pa_alsa_profile *p) {
                 if (!pa_strbuf_isempty(sb))
                     pa_strbuf_puts(sb, " + ");
 
-                pa_strbuf_printf(sb, "%s Input", m->description);
+                pa_strbuf_printf(sb, _("%s Input"), m->description);
             }
 
         p->description = pa_strbuf_tostring_free(sb);

commit af18bc8038177a4b83171671daaf771ecf353b8e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 25 04:34:04 2010 +0100

    alsa-source: fix enum types

diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 0b95314..d214749 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1040,9 +1040,9 @@ static int source_set_state_cb(pa_source *s, pa_source_state_t new_state) {
 
     old_state = pa_source_get_state(u->source);
 
-    if (PA_SINK_IS_OPENED(old_state) && new_state == PA_SINK_SUSPENDED)
+    if (PA_SOURCE_IS_OPENED(old_state) && new_state == PA_SOURCE_SUSPENDED)
         reserve_done(u);
-    else if (old_state == PA_SINK_SUSPENDED && PA_SINK_IS_OPENED(new_state))
+    else if (old_state == PA_SOURCE_SUSPENDED && PA_SOURCE_IS_OPENED(new_state))
         if (reserve_init(u, u->device_name) < 0)
             return -PA_ERR_BUSY;
 

commit 948950a3fd9f80875c3f8d5e24e250c237ab6e67
Author: Daniel Mack <zonque at gmail.com>
Date:   Thu Nov 18 18:30:55 2010 -0800

    module-bonjour-publish: don't include avahi headers
    
    The avahi layer won't work on OSX and is unnecessary, too.

diff --git a/src/modules/module-bonjour-publish.c b/src/modules/module-bonjour-publish.c
index 81b5976..095a1d2 100644
--- a/src/modules/module-bonjour-publish.c
+++ b/src/modules/module-bonjour-publish.c
@@ -44,7 +44,6 @@
 #include <pulsecore/core-subscribe.h>
 #include <pulsecore/dynarray.h>
 #include <pulsecore/modargs.h>
-#include <pulsecore/avahi-wrap.h>
 #include <pulsecore/endianmacros.h>
 #include <pulsecore/protocol-native.h>
 

-- 
hooks/post-receive
PulseAudio Sound Server