mediaplayer: bluetooth: update discovery_result response to new format

[apps/mediaplayer.git] / app / api / BluetoothManager.qml

diff --git a/app/api/BluetoothManager.qml b/app/api/BluetoothManager.qml
index bb273a5..ea33dfe 100644 (file)
--- a/app/api/BluetoothManager.qml
+++ b/app/api/BluetoothManager.qml
@@ -66,10 +66,10 @@ WebSocket {
                 var address = ""
 
                 if (request.info == "BT - Scan Result is Displayed") {
-                    for (var i = 0; i < response.length; i++) {
-                        var data = response[i]
+                    for (var i = 0; i < response.list.length; i++) {
+                        var data = list.response[i]
                         if (data.Connected == "True" && data.UUIDs.indexOf(avrcp_uuid) >= 0) {
-                            address = response[i].Address
+                            address = data.Address
                             console.debug("Connected Device: " + address)
 
                             root.connected = true
@@ -85,7 +85,6 @@ WebSocket {
                     root.deviceAddress = address
                     if (!address) {
                         root.connected = false
-                        playlistview.visible = true
                     }
                 }
                 break
@@ -102,6 +101,9 @@ WebSocket {
                     var data = payload.data
                     var metadata = data.Metadata
 
+                    if (root.deviceAddress == "")
+                        root.deviceAddress = data.Address
+
                     if (root.deviceAddress != data.Address)
                         break
 
@@ -110,6 +112,7 @@ WebSocket {
                         sendSocketMessage("discovery_result", 'None')
                         break
                     }
+                    root.connected = data.Connected == "True"
                     root.av_connected = data.AVPConnected == "True"
 
                     if ('Position' in metadata) {
@@ -145,10 +148,8 @@ WebSocket {
         switch (status) {
             case WebSocket.Open:
             console.debug("onStatusChanged: Open")
-            sendSocketMessage("eventadd", { "tag" : "device_updated", "name" : "device_updated" })
-            sendSocketMessage("eventsub", { "tag" : "device_updated" })
-            sendSocketMessage("eventadd", { "tag" : "connection", "name" : "connection" })
-            sendSocketMessage("eventsub", { "tag" : "connection" })
+            sendSocketMessage("subscribe", { value : "device_updated" })
+            sendSocketMessage("subscribe", { value : "connection" })
             sendSocketMessage("discovery_result", 'None')
             break
             case WebSocket.Error:
@@ -173,7 +174,6 @@ WebSocket {
     function connect_profiles() {
         sendSocketMessage("connect", { "value": root.deviceAddress, "uuid": a2dp_uuid })
         sendSocketMessage("connect", { "value": root.deviceAddress, "uuid": avrcp_uuid })
-        root.av_connected = true
     }
 
     function disconnect_profiles() {