mediaplayer: qml: fix clear() being called on wrong object
[apps/mediaplayer.git] / app / MediaPlayer.qml
index 77538a6..6f8d0db 100644 (file)
@@ -19,30 +19,152 @@ import QtQuick.Layouts 1.1
 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
 
-    API.LightMediaScanner {
-        id: binding
-        url: bindingAddress
+    Item {
+        id: player
+
+        property string title: ""
+        property string album: ""
+        property string artist: ""
+
+        property int duration: 0
+        property int position: 0
+
+        property string cover_art: ""
+        property string status: ""
+
+        function time2str(value) {
+            return Qt.formatTime(new Date(value), 'mm:ss')
+        }
     }
 
-    API.BluetoothManager {
+    Item {
         id: bluetooth
-        url: bindingAddress
+
+        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)
+        }
     }
 
-    MediaPlayer {
-        id: player
-        audioRole: MediaPlayer.MusicRole
-        autoLoad: true
-        playlist: playlist
+    Connections {
+        target: bluetooth_connection
 
-        function time2str(value) {
-            return Qt.formatTime(new Date(value), 'mm:ss')
+        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
+
+            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
+            }
+
+            if (metadata.status) {
+                player.status = metadata.status
+            }
+
+            if (metadata.image) {
+                player.cover_art = metadata.image
+            }
+
+            playlistview.currentIndex = metadata.index
         }
     }
 
@@ -53,16 +175,13 @@ ApplicationWindow {
         repeat: true
         onTriggered: {
             bluetooth.position = bluetooth.position + 250
-            slider.value = bluetooth.position
         }
     }
 
-    Playlist {
-        id: playlist
-        playbackMode: random.checked ? Playlist.Random : loop.checked ? Playlist.Loop : Playlist.Sequential
+    ListModel {
+        id: playlist_model
     }
 
-
     ColumnLayout {
         anchors.fill: parent
         Item {
@@ -77,7 +196,7 @@ ApplicationWindow {
                 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
             }
 
@@ -100,17 +219,19 @@ ApplicationWindow {
                         Layout.fillHeight: true
                         Row {
                             spacing: 20
-                            ToggleButton {
-                                id: random
-                                visible: bluetooth.connected == false
-                                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 {
@@ -118,13 +239,13 @@ ApplicationWindow {
                             Label {
                                 id: title
                                 Layout.alignment: Layout.Center
-                                text: bluetooth.av_connected ? bluetooth.title : (player.metaData.title ? player.metaData.title : '')
+                                text: bluetooth.av_connected ? bluetooth.title : (player.title ? player.title : '')
                                 horizontalAlignment: Label.AlignHCenter
                                 verticalAlignment: Label.AlignVCenter
                             }
                             Label {
                                 Layout.alignment: Layout.Center
-                                text: bluetooth.av_connected ? bluetooth.artist : (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
@@ -157,7 +278,7 @@ ApplicationWindow {
                             font.pixelSize: 32
                             text: bluetooth.av_connected ? player.time2str(bluetooth.duration) : player.time2str(player.duration)
                         }
-                        onPressedChanged: player.seek(value)
+                        onPressedChanged: mediaplayer.seek(value)
                     }
                     RowLayout {
                         Layout.fillHeight: true
@@ -173,10 +294,10 @@ ApplicationWindow {
                             offImage: './images/AGL_MediaPlayer_BackArrow.svg'
                             onClicked: {
                                 if (bluetooth.av_connected) {
-                                    bluetooth.sendMediaCommand("Previous")
+                                    bluetooth.set_avrcp_controls("Previous")
                                     bluetooth.position = 0
                                 } else {
-                                    playlist.previous()
+                                    mediaplayer.previous()
                                 }
                             }
                         }
@@ -185,18 +306,21 @@ ApplicationWindow {
                             offImage: './images/AGL_MediaPlayer_Player_Play.svg'
                             onClicked: {
                                 if (bluetooth.av_connected) {
-                                    bluetooth.sendMediaCommand("Play")
+                                    bluetooth.set_avrcp_controls("Play")
                                 } else {
-                                    player.play()
+                                    mediaplayer.play()
                                 }
                             }
                             states: [
                                 State {
-                                    when: player.playbackState === MediaPlayer.PlayingState
+                                    when: player.status == "playing"
                                     PropertyChanges {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
-                                        onClicked: player.pause()
+                                        onClicked: {
+                                            player.status = ""
+                                            mediaplayer.pause()
+                                        }
                                     }
                                 },
                                 State {
@@ -204,7 +328,7 @@ ApplicationWindow {
                                     PropertyChanges {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
-                                        onClicked: bluetooth.sendMediaCommand("Pause")
+                                        onClicked: bluetooth.set_avrcp_controls("Pause")
                                     }
                                 }
 
@@ -215,9 +339,9 @@ ApplicationWindow {
                             offImage: './images/AGL_MediaPlayer_ForwardArrow.svg'
                             onClicked: {
                                 if (bluetooth.av_connected) {
-                                    bluetooth.sendMediaCommand("Next")
+                                    bluetooth.set_avrcp_controls("Next")
                                 } else {
-                                    playlist.next()
+                                    mediaplayer.next()
                                 }
                             }
                         }
@@ -247,11 +371,6 @@ ApplicationWindow {
             Layout.fillHeight: true
             Layout.preferredHeight: 407
 
-           PlaylistWithMetadata {
-               id: playlistmodel
-                source: playlist
-            }
-
             ListView {
                 anchors.fill: parent
                 id: playlistview
@@ -262,8 +381,8 @@ ApplicationWindow {
                     text: 'PLAYLIST'
                     opacity: 0.5
                 }
-                model: playlistmodel
-                currentIndex: playlist.currentIndex
+                model: playlist_model
+                currentIndex: -1
 
                 delegate: MouseArea {
                     id: delegate
@@ -273,12 +392,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 {
@@ -288,19 +401,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)
                     }
                 }