From 1d2ef7923d28a74e08a4309b6fa3d36481d2df3b Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sat, 9 Oct 2010 22:30:20 +0530 Subject: volume: Use a macro to check if a volume is valid This adds a PA_VOLUME_IS_VALID() macro for checking if a given pa_volume_t is valid. This makes changes to the volume ranges simpler (just change PA_VOLUME_MAX, for example, without needing to modify any other code). --- src/modules/dbus/iface-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/dbus/iface-core.c') diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c index e7c00a7b..268a87ed 100644 --- a/src/modules/dbus/iface-core.c +++ b/src/modules/dbus/iface-core.c @@ -1310,7 +1310,7 @@ static void handle_upload_sample(DBusConnection *conn, DBusMessage *msg, void *u } for (i = 0; i < n_volume_entries; ++i) { - if (default_volume[i] > PA_VOLUME_MAX) { + if (!PA_VOLUME_IS_VALID(default_volume[i])) { pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid volume: %u.", default_volume[i]); goto finish; } -- cgit