device-manager-dbus: Fix to use simple array instead of struct array for out parameter

[Version] 11.1.23
[Issue type] Enhancement

Change-Id: I7911fdc8de2768a9b88a0acb55f11c16ad240140
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 9f7c6c3..c415c25 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.22
+Version:          11.1.23
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/device-manager-dbus.c b/src/device-manager-dbus.c
index 135a110..d109fdc 100644 (file)
--- a/src/device-manager-dbus.c
+++ b/src/device-manager-dbus.c
@@ -986,7 +986,7 @@ static bool is_supported_sample_format(pa_sample_format_t *supported_sample_form
 static void handle_get_supported_sample_formats(DBusConnection *conn, DBusMessage *msg, void *userdata) {
     pa_device_manager *dm;
     DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter, array_iter, item_iter;
+    DBusMessageIter msg_iter, array_iter;
     dbus_int32_t device_id;
     pa_tz_device *device;
     pa_sink *sink;
@@ -1023,13 +1023,11 @@ static void handle_get_supported_sample_formats(DBusConnection *conn, DBusMessag
     }
 
     dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "(s)", &array_iter));
+    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "s", &array_iter));
     for (i = 0; sink->supported_sample_formats[i] != PA_SAMPLE_MAX; i++) {
         format = pa_sample_format_to_string(sink->supported_sample_formats[i]);
         pa_log_info("%s is supported", format);
-        pa_assert_se(dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &item_iter));
-        dbus_message_iter_append_basic(&item_iter, DBUS_TYPE_STRING, &format);
-        pa_assert_se(dbus_message_iter_close_container(&array_iter, &item_iter));
+        dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_STRING, &format);
     }
     pa_assert_se(dbus_message_iter_close_container(&msg_iter, &array_iter));
     pa_assert_se(dbus_connection_send(conn, reply, NULL));
@@ -1160,7 +1158,7 @@ static bool is_supported_sample_rate(uint32_t *supported_sample_rates, uint32_t
 static void handle_get_supported_sample_rates(DBusConnection *conn, DBusMessage *msg, void *userdata) {
     pa_device_manager *dm;
     DBusMessage *reply = NULL;
-    DBusMessageIter msg_iter, array_iter, item_iter;
+    DBusMessageIter msg_iter, array_iter;
     dbus_int32_t device_id;
     pa_tz_device *device;
     pa_sink *sink;
@@ -1196,12 +1194,10 @@ static void handle_get_supported_sample_rates(DBusConnection *conn, DBusMessage
     }
 
     dbus_message_iter_init_append(reply, &msg_iter);
-    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "(u)", &array_iter));
+    pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "u", &array_iter));
     for (i = 0; sink->supported_sample_rates[i]; i++) {
         pa_log_info("%u is supported", sink->supported_sample_rates[i]);
-        pa_assert_se(dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &item_iter));
-        dbus_message_iter_append_basic(&item_iter, DBUS_TYPE_UINT32, &sink->supported_sample_rates[i]);
-        pa_assert_se(dbus_message_iter_close_container(&array_iter, &item_iter));
+        dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_UINT32, &sink->supported_sample_rates[i]);
     }
     pa_assert_se(dbus_message_iter_close_container(&msg_iter, &array_iter));
     pa_assert_se(dbus_connection_send(conn, reply, NULL));