diff options
| author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2010-10-19 13:03:48 +0530 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-10-19 09:52:19 +0100 |
| commit | 9b8f20f617358b40b6641925770787627b73b0df (patch) | |
| tree | ba39c0c929a7858f912ee7ebf7edc27b2b51ab0e /src/modules | |
| parent | 340729d66f748c067f63f1a24679513963e19b2d (diff) | |
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.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/dbus/iface-sample.c | 4 | ||||
| -rw-r--r-- | src/modules/dbus/iface-stream.c | 2 | ||||
| -rw-r--r-- | src/modules/module-stream-restore.c | 2 |
3 files changed, 4 insertions, 4 deletions
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; } |