stream-manager-dbus: return device id also for get_current_media_routing_path method

API related: sound_manager_get_current_media_playback_device_id()

[Version] 15.0.35
[Issue Type] Update

Change-Id: I27cbad83700c20262cf5ed5e88987755ff5d7523

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index be642d8..73c495b 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -2,7 +2,7 @@
 
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          15.0.34
+Version:          15.0.35
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/stream-manager-dbus.c b/src/stream-manager-dbus.c
index 096ff5c..fb0c17e 100644 (file)
--- a/src/stream-manager-dbus.c
+++ b/src/stream-manager-dbus.c
@@ -142,6 +142,7 @@ static pa_dbus_arg_info get_current_volume_type_args[]  = { { "io_direction", "s
                                                                    { "type", "s", "out" },
                                                               { "ret_msg", "s", "out" } };
 static pa_dbus_arg_info get_current_media_routing_path_args[]  = { { "io_direction", "s", "in" },
+                                                                    { "device_id", "u", "out" },
                                                                    { "device_type", "s", "out" },
                                                                      { "ret_msg", "s", "out" } };
 static pa_dbus_arg_info update_focus_status_args[]  = { { "parent_id", "u", "in" },
@@ -1560,6 +1561,7 @@ finish:
 static void handle_get_current_media_routing_path(DBusConnection *conn, DBusMessage *msg, void *userdata) {
     pa_stream_manager *m = (pa_stream_manager *)userdata;
     const char *direction = NULL;
+    dbus_uint32_t device_id;
     const char *device_type = dbus_str_none;
     dm_device_direction_t dm_device_direction = DM_DEVICE_DIRECTION_NONE;
     stream_info *s = NULL;
@@ -1603,13 +1605,15 @@ static void handle_get_current_media_routing_path(DBusConnection *conn, DBusMess
 
     if (device) {
         device_type = pa_tz_device_get_type(device);
+        device_id = (dbus_uint32_t)pa_tz_device_get_id(device);
         ret = RET_MSG_OK;
     } else {
         pa_log_error("could not found matched device");
     }
 
 finish:
-    pa_assert_se(dbus_message_append_args(reply, DBUS_TYPE_STRING, &device_type,
+    pa_assert_se(dbus_message_append_args(reply, DBUS_TYPE_UINT32, &device_id,
+                                                 DBUS_TYPE_STRING, &device_type,
                                                  DBUS_TYPE_STRING, &stream_manager_dbus_ret_str[ret],
                                                  DBUS_TYPE_INVALID));
     pa_assert_se(dbus_connection_send(conn, reply, NULL));