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

[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  340729d66f748c067f63f1a24679513963e19b2d (commit)

- Log -----------------------------------------------------------------
44e4709 dbus: Fix log message after volume changes.
9b8f20f volume: Fix incorrect usage of PA_VOLUME_IS_VALID
-----------------------------------------------------------------------

Summary of changes:
 src/modules/dbus/iface-sample.c     |    4 ++--
 src/modules/dbus/iface-stream.c     |    4 ++--
 src/modules/module-stream-restore.c |    2 +-
 src/pulsecore/core-scache.c         |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

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

commit 9b8f20f617358b40b6641925770787627b73b0df
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Tue Oct 19 13:03:48 2010 +0530

    volume: Fix incorrect usage of PA_VOLUME_IS_VALID
    
    The commit that introduced this macro was incorrect in some places. This
    patch fixes these. Thanks to Pierre-Louis Bossart for pointing this out.

diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c
index 2381079..93d4fc8 100644
--- a/src/modules/dbus/iface-sample.c
+++ b/src/modules/dbus/iface-sample.c
@@ -366,7 +366,7 @@ static void handle_play(DBusConnection *conn, DBusMessage *msg, void *userdata)
     if (!(property_list = pa_dbus_get_proplist_arg(conn, msg, &msg_iter)))
         return;
 
-    if (PA_VOLUME_IS_VALID(volume)) {
+    if (!PA_VOLUME_IS_VALID(volume)) {
         pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume.");
         goto finish;
     }
@@ -416,7 +416,7 @@ static void handle_play_to_sink(DBusConnection *conn, DBusMessage *msg, void *us
         goto finish;
     }
 
-    if (PA_VOLUME_IS_VALID(volume)) {
+    if (!PA_VOLUME_IS_VALID(volume)) {
         pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume.");
         goto finish;
     }
diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index 364572b..df00f0e 100644
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -378,7 +378,7 @@ static void handle_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessag
     }
 
     for (i = 0; i < n_volume_entries; ++i) {
-        if (PA_VOLUME_IS_VALID(volume[i])) {
+        if (!PA_VOLUME_IS_VALID(volume[i])) {
             pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Too large volume value: %u", volume[i]);
             return;
         }
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 5ce1c41..37ab306 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -367,7 +367,7 @@ static int get_volume_arg(DBusConnection *conn, DBusMessage *msg, DBusMessageIte
         pa_assert_se(dbus_message_iter_next(&struct_iter));
         dbus_message_iter_get_basic(&struct_iter, &chan_vol);
 
-        if (PA_VOLUME_IS_VALID(chan_vol)) {
+        if (!PA_VOLUME_IS_VALID(chan_vol)) {
             pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume: %u", chan_vol);
             return -1;
         }
diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c
index cd388ef..5ec6159 100644
--- a/src/pulsecore/core-scache.c
+++ b/src/pulsecore/core-scache.c
@@ -336,12 +336,12 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
 
     pass_volume = TRUE;
 
-    if (e->volume_is_set && !PA_VOLUME_IS_VALID(volume)) {
+    if (e->volume_is_set && PA_VOLUME_IS_VALID(volume)) {
         pa_cvolume_set(&r, e->sample_spec.channels, volume);
         pa_sw_cvolume_multiply(&r, &r, &e->volume);
     } else if (e->volume_is_set)
         r = e->volume;
-    else if (!PA_VOLUME_IS_VALID(volume))
+    else if (PA_VOLUME_IS_VALID(volume))
         pa_cvolume_set(&r, e->sample_spec.channels, volume);
     else
         pass_volume = FALSE;

commit 44e4709871178ea956c2e49686dd258131e459a2
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Tue Oct 19 09:53:45 2010 +0100

    dbus: Fix log message after volume changes.

diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index df00f0e..681790b 100644
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -379,7 +379,7 @@ static void handle_set_volume(DBusConnection *conn, DBusMessage *msg, DBusMessag
 
     for (i = 0; i < n_volume_entries; ++i) {
         if (!PA_VOLUME_IS_VALID(volume[i])) {
-            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Too large volume value: %u", volume[i]);
+            pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume: %u", volume[i]);
             return;
         }
         new_vol.values[i] = volume[i];

-- 
hooks/post-receive
PulseAudio Sound Server