mediaplayer: fix race condition with local media and bluetooth a2dp
[apps/mediaplayer.git] / app / MediaPlayer.qml
index 37c2ab1..7dfaf06 100644 (file)
 import QtQuick 2.6
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
-import QtMultimedia 5.6
 import AGL.Demo.Controls 1.0
-import MediaPlayer 1.0
 
 ApplicationWindow {
     id: root
 
-    MediaPlayer {
+    Item {
         id: player
-        audioRole: MediaPlayer.MusicRole
-        autoLoad: true
-        playlist: playlist
+
+        property string title: ""
+        property string album: ""
+        property string artist: ""
+
+        property int duration: 0
+        property int position: 0
+
+        property string cover_art: ""
+        property string status: "stopped"
+
         function time2str(value) {
             return Qt.formatTime(new Date(value), 'mm:ss')
         }
-        onPositionChanged: slider.value = player.position
     }
 
-    Playlist {
-        id: playlist
-        playbackMode: random.checked ? Playlist.Random : loop.checked ? Playlist.Loop : Playlist.Sequential
+    Item {
+        id: bluetooth
+
+        property string deviceAddress: ""
+        property bool connected: false
+        property bool av_connected: false
+
+        property int position: 0
+        property int duration: 0
+
+        property string artist: ""
+        property string title: ""
+        property string state: "stopped"
+
+        // AVRCP Target UUID
+        property string avrcp_uuid: "0000110e-0000-1000-8000-00805f9b34fb"
+
+        function connect_profiles() {
+            var address = bluetooth.deviceAddress;
+            bluetooth_connection.connect(address, "a2dp")
+            bluetooth_connection.connect(address, "avrcp")
+        }
+
+        function disconnect_profiles() {
+            var address = bluetooth.deviceAddress;
+            bluetooth_connection.disconnect(address, "a2dp")
+            bluetooth_connection.disconnect(address, "avrcp")
+        }
+
+        function set_avrcp_controls(cmd) {
+            bluetooth_connection.set_avrcp_controls(bluetooth.deviceAddress, cmd)
+        }
+    }
+
+    Connections {
+        target: bluetooth_connection
+
+        onDeviceListEvent: {
+            var address = ""
+            for (var i = 0; i < data.list.length; i++) {
+                var item = data.list[i]
+                if (item.Connected == "True" && item.UUIDs.indexOf(bluetooth.avrcp_uuid) >= 0) {
+                    address = item.Address
+
+                    bluetooth.connected = true
+                    mediaplayer.pause()
+
+                    //NOTE: This hack is here for when MediaPlayer is started
+                    //      with an existing connection.
+                    bluetooth.av_connected = item.AVPConnected == "True" 
+                }
+            }
+            if (!address)
+                bluetooth.connected = false
+            else
+                bluetooth.deviceAddress = address
+        }
+
+        onDeviceUpdatedEvent: {
+            var metadata = data.Metadata
+
+            if (data.Connected == "False")
+                return
+
+            if (!bluetooth.av_connected && data.AVPConnected == "True") {
+                mediaplayer.pause()
+                player.status = "stopped"
+            }
+
+            bluetooth.connected = data.Connected == "True"
+            bluetooth.av_connected = data.AVPConnected == "True"
+            bluetooth.deviceAddress = data.Address
+
+            if ('Position' in metadata)
+                bluetooth.position = metadata.Position
+
+            if ('Duration' in metadata)
+                bluetooth.duration = metadata.Duration
+
+            if ('Status' in metadata)
+                bluetooth.state = metadata.Status
+
+            if ('Artist' in metadata)
+                bluetooth.artist = metadata.Artist
+
+            if ('Title' in metadata)
+                bluetooth.title = metadata.Title
+        }
+    }
+
+    Connections {
+        target: mediaplayer
+
+        onPlaylistChanged: {
+            playlist_model.clear();
+
+            for (var i = 0; i < playlist.list.length; i++) {
+                var item = playlist.list[i]
+
+                playlist_model.append({ "index": item.index, "artist": item.artist ? item.artist : '', "title": item.title ? item.title : '' })
+
+                if (item.selected) {
+                    playlistview.currentIndex = i
+                }
+            }
+        }
+
+        onMetadataChanged: {
+            player.title = metadata.title
+            player.album = metadata.album
+            player.artist = metadata.artist
+
+            if (metadata.duration) {
+                player.duration = metadata.duration
+            }
+
+            if (metadata.position) {
+                player.position = metadata.position
+            }
 
-        Component.onCompleted: {
-            playlist.addItems(mediaFiles)
+            if (metadata.status) {
+                player.status = metadata.status
+            }
+
+            if (metadata.image) {
+                player.cover_art = metadata.image
+            }
+
+            playlistview.currentIndex = metadata.index
         }
     }
 
+    Timer {
+        id: timer
+        interval: 250
+        running: (bluetooth.av_connected && bluetooth.state == "playing")
+        repeat: true
+        onTriggered: {
+            bluetooth.position = bluetooth.position + 250
+        }
+    }
+
+    ListModel {
+        id: playlist_model
+    }
 
     ColumnLayout {
         anchors.fill: parent
@@ -53,12 +194,14 @@ ApplicationWindow {
             Layout.preferredHeight: 1080
             clip: true
             Image {
+                id: albumart
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
                 height: sourceSize.height * width / sourceSize.width
                 fillMode: Image.PreserveAspectCrop
-                source: player.metaData.coverArtImage ? player.metaData.coverArtImage : ''
+                source: player.cover_art ? player.cover_art : ''
+                visible: bluetooth.av_connected == false
             }
 
             Item {
@@ -80,15 +223,19 @@ ApplicationWindow {
                         Layout.fillHeight: true
                         Row {
                             spacing: 20
-                            ToggleButton {
-                                id: random
-                                offImage: './images/AGL_MediaPlayer_Shuffle_Inactive.svg'
-                                onImage: './images/AGL_MediaPlayer_Shuffle_Active.svg'
-                            }
+                            //ToggleButton {
+                            //    id: random
+                            //    visible: bluetooth.connected == false
+                            //    offImage: './images/AGL_MediaPlayer_Shuffle_Inactive.svg'
+                            //    onImage: './images/AGL_MediaPlayer_Shuffle_Active.svg'
+                            //}
                             ToggleButton {
                                 id: loop
+                                visible: bluetooth.connected == false
+                                //checked: player.loop_state
                                 offImage: './images/AGL_MediaPlayer_Loop_Inactive.svg'
                                 onImage: './images/AGL_MediaPlayer_Loop_Active.svg'
+                                onClicked: { mediaplayer.loop(checked) }
                             }
                         }
                         ColumnLayout {
@@ -96,14 +243,13 @@ ApplicationWindow {
                             Label {
                                 id: title
                                 Layout.alignment: Layout.Center
-                                text: player.metaData.title ? player.metaData.title : ''
+                                text: bluetooth.av_connected ? bluetooth.title : (player.title ? player.title : '')
                                 horizontalAlignment: Label.AlignHCenter
                                 verticalAlignment: Label.AlignVCenter
                             }
                             Label {
-                                id: artist
                                 Layout.alignment: Layout.Center
-                                text: player.metaData.contributingArtist ? player.metaData.contributingArtist : ''
+                                text: bluetooth.av_connected ? bluetooth.artist : (player.artist ? player.artist : '')
                                 horizontalAlignment: Label.AlignHCenter
                                 verticalAlignment: Label.AlignVCenter
                                 font.pixelSize: title.font.pixelSize * 0.6
@@ -113,22 +259,30 @@ ApplicationWindow {
                     Slider {
                         id: slider
                         Layout.fillWidth: true
-                        to: player.duration
+                        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.av_connected) {
+                                return player.time2str(bluetooth.position)
+                            }
+                            return player.time2str(player.position)
+                        }
                         Label {
                             id: position
                             anchors.left: parent.left
                             anchors.bottom: parent.top
                             font.pixelSize: 32
-                            text: player.time2str(player.position)
+                            text: slider.getPosition()
                         }
                         Label {
                             id: duration
                             anchors.right: parent.right
                             anchors.bottom: parent.top
                             font.pixelSize: 32
-                            text: player.time2str(player.duration)
+                            text: bluetooth.av_connected ? player.time2str(bluetooth.duration) : player.time2str(player.duration)
                         }
-                        onPressedChanged: player.seek(value)
+                        onPressedChanged: mediaplayer.seek(value)
                     }
                     RowLayout {
                         Layout.fillHeight: true
@@ -140,36 +294,85 @@ ApplicationWindow {
 //                        }
                         Item { Layout.fillWidth: true }
                         ImageButton {
+                            id: previous
                             offImage: './images/AGL_MediaPlayer_BackArrow.svg'
-                            onClicked: playlist.previous()
+                            onClicked: {
+                                if (bluetooth.av_connected) {
+                                    bluetooth.set_avrcp_controls("Previous")
+                                    bluetooth.position = 0
+                                } else {
+                                    mediaplayer.previous()
+                                }
+                            }
                         }
                         ImageButton {
                             id: play
-                            offImage: './images/AGL_MediaPlayer_Player_Play.svg'
-                            onClicked: player.play()
                             states: [
                                 State {
-                                    when: player.playbackState === MediaPlayer.PlayingState
+                                    when: !bluetooth.av_connected && player.status == "playing"
+                                    PropertyChanges {
+                                        target: play
+                                        offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
+                                        onClicked: {
+                                            player.status = "stopped"
+                                            mediaplayer.pause()
+                                        }
+                                    }
+                                },
+                                State {
+                                    when: bluetooth.av_connected && bluetooth.state == "playing"
                                     PropertyChanges {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
-                                        onClicked: player.pause()
+                                        onClicked: bluetooth.set_avrcp_controls("Pause")
+                                    }
+                                },
+                                State {
+                                    when: !bluetooth.av_connected && player.status != "playing"
+                                    PropertyChanges {
+                                        target: play
+                                        offImage: './images/AGL_MediaPlayer_Player_Play.svg'
+                                        onClicked: mediaplayer.play()
+                                    }
+                                },
+                                State {
+                                    when: bluetooth.av_connected && bluetooth.state != "playing"
+                                    PropertyChanges {
+                                        target: play
+                                        offImage: './images/AGL_MediaPlayer_Player_Play.svg'
+                                        onClicked: bluetooth.set_avrcp_controls("Play")
                                     }
                                 }
                             ]
                         }
                         ImageButton {
+                            id: forward
                             offImage: './images/AGL_MediaPlayer_ForwardArrow.svg'
-                            onClicked: playlist.next()
+                            onClicked: {
+                                if (bluetooth.av_connected) {
+                                    bluetooth.set_avrcp_controls("Next")
+                                } else {
+                                    mediaplayer.next()
+                                }
+                            }
                         }
 
                         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()
+                                  }
+                              }
+                        }
                     }
                 }
             }
@@ -178,18 +381,19 @@ ApplicationWindow {
             Layout.fillWidth: true
             Layout.fillHeight: true
             Layout.preferredHeight: 407
+
             ListView {
                 anchors.fill: parent
+                id: playlistview
+                visible: bluetooth.av_connected == false
                 clip: true
                 header: Label {
                     x: 50
                     text: 'PLAYLIST'
                     opacity: 0.5
                 }
-                model: PlaylistWithMetadata {
-                    source: playlist
-                }
-                currentIndex: playlist.currentIndex
+                model: playlist_model
+                currentIndex: -1
 
                 delegate: MouseArea {
                     id: delegate
@@ -199,12 +403,6 @@ ApplicationWindow {
                         anchors.fill: parent
                         anchors.leftMargin: 50
                         anchors.rightMargin: 50
-                        Image {
-                            source: model.coverArt
-                            fillMode: Image.PreserveAspectFit
-                            Layout.preferredWidth: delegate.height
-                            Layout.preferredHeight: delegate.height
-                        }
                         ColumnLayout {
                             Layout.fillWidth: true
                             Label {
@@ -214,19 +412,18 @@ ApplicationWindow {
                             Label {
                                 Layout.fillWidth: true
                                 text: model.artist
-                                color: '#66FF99'
+                                color: '#00ADDC'
                                 font.pixelSize: 32
                             }
                         }
-                        Label {
-                            text: player.time2str(model.duration)
-                            color: '#66FF99'
-                            font.pixelSize: 32
-                        }
+                        //Label {
+                        //    text: player.time2str(model.duration)
+                        //    color: '#00ADDC'
+                        //    font.pixelSize: 32
+                        //}
                     }
                     onClicked: {
-                        playlist.currentIndex = model.index
-                        player.play()
+                        mediaplayer.picktrack(playlistview.model.get(index).index)
                     }
                 }