X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2FMediaPlayer.qml;h=77538a671ba8179d9ee638a4f409a174bbe58bdb;hb=3855968eb0f1ac8214787efe8281902145d79e17;hp=4a29d9503102280dac88d5b370e59be340c0d45a;hpb=ba39b5e73165886e9739d23f97f7df842ae7d7e1;p=apps%2Fmediaplayer.git

diff --git a/app/MediaPlayer.qml b/app/MediaPlayer.qml
index 4a29d95..77538a6 100644
--- a/app/MediaPlayer.qml
+++ b/app/MediaPlayer.qml
@@ -20,77 +20,19 @@ import QtQuick.Controls 2.0
 import QtMultimedia 5.6
 import AGL.Demo.Controls 1.0
 import MediaPlayer 1.0
+import 'api' as API
 
 ApplicationWindow {
     id: root
 
-    Item {
-        id: bluetooth
-        property bool connected: false
-        property string state
-
-        property string artist
-        property string title
-        property int duration: 0
-        property int position: 0
-        property int pos_offset: 0
-
-        function disableBluetooth() {
-            bluetooth.artist = ''
-            bluetooth.title = ''
-            bluetooth.duration = 0
-            bluetooth.position = 0
-            bluetooth.pos_offset = 0
-            bluetooth.connected = false
-        }
+    API.LightMediaScanner {
+        id: binding
+        url: bindingAddress
     }
 
-    Connections {
-        target: dbus
-
-        onStopPlayback: {
-            player.stop()
-            playlist.clear()
-            playlistmodel.setSource(playlist)
-            playlistview.visible = false
-        }
-
-        onProcessPlaylistUpdate: {
-            playlist.clear()
-            playlist.addItems(mediaFiles)
-
-            playlistmodel.setSource(playlist)
-            playlistview.visible = bluetooth.connected == false
-        }
-
-        onProcessPlaylistHide: {
-            playlistview.visible = false
-            player.stop()
-        }
-
-        onProcessPlaylistShow: {
-            playlistview.visible = true
-            bluetooth.disableBluetooth()
-        }
-
-        onDisplayBluetoothMetadata: {
-            if (avrcp_artist)
-                bluetooth.artist = avrcp_artist
-            if (avrcp_title)
-                bluetooth.title = avrcp_title
-            bluetooth.duration = avrcp_duration
-            bluetooth.pos_offset = 0
-        }
-
-        onUpdatePlayerStatus: {
-            bluetooth.connected = true
-            bluetooth.state = status
-        }
-
-        onUpdatePosition: {
-            slider.value = current_position
-            bluetooth.position = current_position
-        }
+    API.BluetoothManager {
+        id: bluetooth
+        url: bindingAddress
     }
 
     MediaPlayer {
@@ -99,20 +41,18 @@ ApplicationWindow {
         autoLoad: true
         playlist: playlist
 
-        property bool is_bluetooth: false
         function time2str(value) {
             return Qt.formatTime(new Date(value), 'mm:ss')
         }
-        onPositionChanged: slider.value = player.position
     }
 
     Timer {
         id: timer
         interval: 250
-        running: (bluetooth.connected && bluetooth.state == "playing")
+        running: (bluetooth.av_connected && bluetooth.state == "playing")
         repeat: true
         onTriggered: {
-            bluetooth.position = dbus.getCurrentPosition() - bluetooth.pos_offset
+            bluetooth.position = bluetooth.position + 250
             slider.value = bluetooth.position
         }
     }
@@ -120,10 +60,6 @@ ApplicationWindow {
     Playlist {
         id: playlist
         playbackMode: random.checked ? Playlist.Random : loop.checked ? Playlist.Loop : Playlist.Sequential
-
-        Component.onCompleted: {
-            playlist.addItems(mediaFiles)
-        }
     }
 
 
@@ -142,7 +78,7 @@ ApplicationWindow {
                 height: sourceSize.height * width / sourceSize.width
                 fillMode: Image.PreserveAspectCrop
                 source: player.metaData.coverArtImage ? player.metaData.coverArtImage : ''
-                visible: bluetooth.connected == false
+                visible: bluetooth.av_connected == false
             }
 
             Item {
@@ -182,13 +118,13 @@ ApplicationWindow {
                             Label {
                                 id: title
                                 Layout.alignment: Layout.Center
-                                text: bluetooth.title ? bluetooth.title : (player.metaData.title ? player.metaData.title : '')
+                                text: bluetooth.av_connected ? bluetooth.title : (player.metaData.title ? player.metaData.title : '')
                                 horizontalAlignment: Label.AlignHCenter
                                 verticalAlignment: Label.AlignVCenter
                             }
                             Label {
                                 Layout.alignment: Layout.Center
-                                text: bluetooth.artist ? bluetooth.artist : (player.metaData.contributingArtist ? player.metaData.contributingArtist : '')
+                                text: bluetooth.av_connected ? bluetooth.artist : (player.metaData.contributingArtist ? player.metaData.contributingArtist : '')
                                 horizontalAlignment: Label.AlignHCenter
                                 verticalAlignment: Label.AlignVCenter
                                 font.pixelSize: title.font.pixelSize * 0.6
@@ -198,10 +134,11 @@ ApplicationWindow {
                     Slider {
                         id: slider
                         Layout.fillWidth: true
-                        to: bluetooth.connected ? bluetooth.duration : player.duration
-                        enabled: bluetooth.connected == false
+                        to: bluetooth.av_connected ? bluetooth.duration : player.duration
+                        enabled: bluetooth.av_connected == false
+                        value: bluetooth.av_connected ? bluetooth.position : player.position
                         function getPosition() {
-                            if (bluetooth.connected && bluetooth.position) {
+                            if (bluetooth.av_connected) {
                                 return player.time2str(bluetooth.position)
                             }
                             return player.time2str(player.position)
@@ -218,7 +155,7 @@ ApplicationWindow {
                             anchors.right: parent.right
                             anchors.bottom: parent.top
                             font.pixelSize: 32
-                            text: bluetooth.connected ? player.time2str(bluetooth.duration) : player.time2str(player.duration)
+                            text: bluetooth.av_connected ? player.time2str(bluetooth.duration) : player.time2str(player.duration)
                         }
                         onPressedChanged: player.seek(value)
                     }
@@ -235,9 +172,9 @@ ApplicationWindow {
                             id: previous
                             offImage: './images/AGL_MediaPlayer_BackArrow.svg'
                             onClicked: {
-                                if (bluetooth.connected) {
-                                    bluetooth.pos_offset = dbus.getCurrentPosition()
-                                    dbus.processQMLEvent("Previous")
+                                if (bluetooth.av_connected) {
+                                    bluetooth.sendMediaCommand("Previous")
+                                    bluetooth.position = 0
                                 } else {
                                     playlist.previous()
                                 }
@@ -247,8 +184,8 @@ ApplicationWindow {
                             id: play
                             offImage: './images/AGL_MediaPlayer_Player_Play.svg'
                             onClicked: {
-                                if (bluetooth.connected) {
-                                    dbus.processQMLEvent("Play")
+                                if (bluetooth.av_connected) {
+                                    bluetooth.sendMediaCommand("Play")
                                 } else {
                                     player.play()
                                 }
@@ -263,11 +200,11 @@ ApplicationWindow {
                                     }
                                 },
                                 State {
-                                    when: bluetooth.connected && bluetooth.state == "playing"
+                                    when: bluetooth.av_connected && bluetooth.state == "playing"
                                     PropertyChanges {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
-                                        onClicked: dbus.processQMLEvent("Pause")
+                                        onClicked: bluetooth.sendMediaCommand("Pause")
                                     }
                                 }
 
@@ -277,8 +214,8 @@ ApplicationWindow {
                             id: forward
                             offImage: './images/AGL_MediaPlayer_ForwardArrow.svg'
                             onClicked: {
-                                if (bluetooth.connected) {
-                                    dbus.processQMLEvent("Next")
+                                if (bluetooth.av_connected) {
+                                    bluetooth.sendMediaCommand("Next")
                                 } else {
                                     playlist.next()
                                 }
@@ -286,12 +223,21 @@ ApplicationWindow {
                         }
 
                         Item { Layout.fillWidth: true }
-//                        Image {
-//                            source: './images/AGL_MediaPlayer_Bluetooth_Inactive.svg'
-//                        }
-//                        Image {
-//                            source: './images/AGL_MediaPlayer_Radio_Inactive.svg'
-//                        }
+ 
+                        ToggleButton {
+                              visible: bluetooth.connected
+                              checked: bluetooth.av_connected
+                              offImage: './images/AGL_MediaPlayer_Bluetooth_Inactive.svg'
+                              onImage: './images/AGL_MediaPlayer_Bluetooth_Active.svg'
+
+                              onClicked: {
+                                  if (bluetooth.av_connected) {
+                                      bluetooth.disconnect_profiles()
+                                  } else {
+                                      bluetooth.connect_profiles()
+                                  }
+                              }
+                        }
                     }
                 }
             }
@@ -309,6 +255,7 @@ ApplicationWindow {
             ListView {
                 anchors.fill: parent
                 id: playlistview
+                visible: bluetooth.av_connected == false
                 clip: true
                 header: Label {
                     x: 50