From 9b8f20f617358b40b6641925770787627b73b0df Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date: Tue, 19 Oct 2010 13:03:48 +0530
Subject: 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.
---
 src/modules/dbus/iface-sample.c     | 4 ++--
 src/modules/dbus/iface-stream.c     | 2 +-
 src/modules/module-stream-restore.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c
index 23810792..93d4fc8c 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 364572b8..df00f0ea 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 5ce1c415..37ab306f 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;
         }
-- 
cgit