[pulseaudio-commits] Branch 'stable-1.x' - 2 commits - src/modules src/pulsecore

[Arun Raghavan]

 src/modules/module-solaris.c  |    4 ++--
 src/pulsecore/socket-server.c |    9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 610d63e3f4faea307e585deb061c7e63e952e535
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Oct 20 14:46:23 2011 +0530

    solaris: Use real_volume for set/get volume
    
    This got missed when other bits were updated. Patch submitted by
    Brian Cameron <brian.cameron at oracle.com>.

diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 61ea68c..5081ceb 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -526,7 +526,7 @@ static void source_set_volume(pa_source *s) {
     if (u->fd >= 0) {
         AUDIO_INITINFO(&info);
 
-        info.play.gain = pa_cvolume_max(&s->volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
+        info.play.gain = pa_cvolume_max(&s->real_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
         assert(info.play.gain <= AUDIO_MAX_GAIN);
 
         if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
@@ -548,7 +548,7 @@ static void source_get_volume(pa_source *s) {
         if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0)
             pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno));
         else
-            pa_cvolume_set(&s->volume, s->sample_spec.channels, info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN);
+            pa_cvolume_set(&s->real_volume, s->sample_spec.channels, info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN);
     }
 }
 

commit a40a2af9ae3caf0b53b7826ecbf4737c51515079
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Oct 20 14:44:22 2011 +0530

    native: Fix Solaris build
    
    tcpwrappers has some Solaris-specific quirks that need to be dealt with.
    Patch submitted by Brian Cameron <brian.cameron at oracle.com>.

diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c
index 23096a0..fd81c2a 100644
--- a/src/pulsecore/socket-server.c
+++ b/src/pulsecore/socket-server.c
@@ -45,8 +45,17 @@
 
 #ifdef HAVE_LIBWRAP
 #include <tcpd.h>
+
+/* Solaris requires that the allow_severity and deny_severity variables be
+ * defined in the client program. */
+#ifdef __sun
+#include <syslog.h>
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_WARNING;
 #endif
 
+#endif /* HAVE_LIBWRAP */
+
 #include <pulse/xmalloc.h>
 #include <pulse/util.h>