Add parameter when remote devices is detected 37/239237/2
authorJaechul Lee <jcsing.lee@samsung.com>
Thu, 23 Jul 2020 04:55:27 +0000 (13:55 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Thu, 23 Jul 2020 05:02:44 +0000 (14:02 +0900)
Change-Id: I0d1b2cda508c8d89e706036cd341daa9d2d346c3
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
src/device-manager.c
src/stream-manager-dbus-priv.h
src/stream-manager-dbus.c

index d6fe91d445192bb1dcb099629ba078222cd60966..63d13a9e559c37e364337964eec46462f6b0f031 100644 (file)
@@ -1658,7 +1658,7 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
         pulse_device_set_use_internal_codec(PA_OBJECT(source), false);
         handle_bt_pulse_device(PA_OBJECT(source), true, dm);
         return PA_HOOK_OK;
-       } else if (pulse_device_is_raop(PA_OBJECT(source))) {
+    } else if (pulse_device_is_raop(PA_OBJECT(source))) {
         pulse_device_set_use_internal_codec(PA_OBJECT(source), false);
         handle_raop_pulse_device(PA_OBJECT(source), true, dm);
         return PA_HOOK_OK;
index c035ab751190acd2b1ba53196df19a38375b5522..3b0ea885f2f9392ed05aad3c6d2b18eebf239a95 100644 (file)
@@ -284,6 +284,17 @@ pa_dbus_interface_info stream_manager_interface_info = {
     "   <arg name=\"name\" type=\"s\"/>"                                     \
     "   <arg name=\"value\" type=\"i\"/>"                                    \
     "  </signal>"                                                            \
+    "  <signal name=\"STREAM_MANAGER_SIGNAL_NAME_FOUND_REMOTE\">"            \
+    "   <arg name=\"type\" type=\"i\"/>"                                     \
+    "   <arg name=\"index\" type=\"u\"/>"                                    \
+    "   <arg name=\"conneted\" type=\"b\"/>"                                 \
+    "   <arg name=\"remote_name\" type=\"s\"/>"                              \
+    "   <arg name=\"peer_info\" type=\"s\"/>"                                \
+    "  </signal>"                                                            \
+    "  <signal name=\"STREAM_MANAGER_SIGNAL_NAME_REMOTE_ACCESS\">"           \
+    "   <arg name=\"index\" type=\"u\"/>"                                     \
+    "   <arg name=\"permission\" type=\"s\"/>"                                    \
+    "  </signal>"                                                            \
     " </interface>"                                                          \
     " <interface name=\"org.freedesktop.DBus.Introspectable\">"              \
     "  <method name=\"Introspect\">"                                         \
index dceb50aff48ac10376823574144e75379cb63b48..9dc9f5300ec3fe367d1494f2a7b8de3070729f45 100644 (file)
@@ -2510,6 +2510,7 @@ void broadcast_connected_remote_device(DBusConnection *conn, bool connected, uns
     DBusMessage *signal_msg;
     DBusMessageIter msg_iter;
     dbus_bool_t c = (dbus_bool_t)connected;
+    uint32_t type = 1; // TODO: 0:sink-input, 1:source-output
 
     pa_assert(conn);
 
@@ -2520,13 +2521,14 @@ void broadcast_connected_remote_device(DBusConnection *conn, bool connected, uns
         return;
     }
 
-    pa_log_info("connected[%d], index[%d], remote_name[%s] peer_info[%s]", connected, index, remote_name, peer_info);
+    pa_log_info("type[%d], index[%d], connected[%d], remote_name[%s] peer_info[%s]", type, index, connected, remote_name, peer_info);
 
     pa_assert_se((signal_msg = dbus_message_new_signal(STREAM_MANAGER_OBJECT_PATH, STREAM_MANAGER_INTERFACE, STREAM_MANAGER_SIGNAL_NAME_FOUND_REMOTE)));
     dbus_message_iter_init_append(signal_msg, &msg_iter);
 
-    dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_BOOLEAN, &c);
+    dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_INT32, &type);
     dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_UINT32, &index);
+    dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_BOOLEAN, &c);
     dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &remote_name);
     dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &peer_info);