Validate duckding state with command in handle_activate_ducking()

[Version] 11.1.91
[Profile] Common
[Issue Type] Improvement

Change-Id: I07ff4491f2adc53d623cab82cfb779aeb60e943a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index c2b212d91cfebd88ead26dd91985044343fcd320..71455e07a36e62e7b7655ee84271d01d21ab9c28 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          11.1.89
+Version:          11.1.90
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/stream-manager-dbus.c b/src/stream-manager-dbus.c
index 250c91b48e818c25fcb9e39793c1705ac1acf8b4..2d83d2b2a1ef3edf4b57fd48fc9a768e2f146f90 100644 (file)
--- a/src/stream-manager-dbus.c
+++ b/src/stream-manager-dbus.c
@@ -1900,10 +1900,10 @@ static void handle_activate_ducking(DBusConnection *conn, DBusMessage *msg, void
         goto _ACTIVATE_DUCKING_DONE;
     }
 
-    /* check operating now */
-    if (sd->state == STREAM_DUCKING_STATE_DUCKING ||
-        sd->state == STREAM_DUCKING_STATE_UNDUCKING) {
-        pa_log_error("now ducking or unducking (state:%u)", sd->state);
+    /* validate state with command */
+    if ((enable && sd->state != STREAM_DUCKING_STATE_UNDUCKED) ||
+        (!enable && sd->state != STREAM_DUCKING_STATE_DUCKED)) {
+        pa_log_error("state validation failed - [%d,s:%u]", enable, sd->state);
         ret_msg = RET_MSG_ERROR_INVALID_STATE;
         goto _ACTIVATE_DUCKING_DONE;
     }
@@ -1963,7 +1963,7 @@ static void handle_activate_ducking(DBusConnection *conn, DBusMessage *msg, void
         memset(&sd->vol_key, 0, sizeof(sd->vol_key));
     }
 
-    pa_log_info("ducking stream count(%p,%d)", sd, sd->ducking_stream_count);
+    pa_log_info("ducking stream count[%p,%d]", sd, sd->ducking_stream_count);
 
 _ACTIVATE_DUCKING_DONE:
     pa_assert_se(dbus_message_append_args(reply, DBUS_TYPE_STRING, &stream_manager_dbus_ret_str[ret_msg], DBUS_TYPE_INVALID));
@@ -1989,7 +1989,7 @@ _ACTIVATE_DUCKING_DONE:
         else
             sd->state = STREAM_DUCKING_STATE_UNDUCKED;
 
-        pa_log_info("send signal for ramp finished(but, no stream matched) - state(%u)", sd->state);
+        pa_log_info("send signal for ramp finished(but, no stream matched) - state[%u]", sd->state);
 
         send_ducking_state_changed_signal(pa_dbus_connection_get(m->dbus_conn), sd->trigger_index, is_stream_ducked(sd));
     }