X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=app%2FMediaPlayer.qml;h=c8595097be9625e028b370396610e9172233b80e;hb=9a5bce741041f99d11ef283ebfd8c166a38f0740;hp=7cca337af9d64db6d610a079bc5c4c9b8db9f180;hpb=25da494cecca276affc0743971788b68650df79f;p=apps%2Fmediaplayer.git

diff --git a/app/MediaPlayer.qml b/app/MediaPlayer.qml
index 7cca337..c859509 100644
--- a/app/MediaPlayer.qml
+++ b/app/MediaPlayer.qml
@@ -37,7 +37,6 @@ ApplicationWindow {
         property int duration: 0
         property int position: 0
 
-        property string cover_art: ""
         property string status: "stopped"
 
         function time2str(value) {
@@ -59,15 +58,7 @@ ApplicationWindow {
                 player.av_connected = metadata.connected
             }
 
-            if ('position' in metadata) {
-                player.position = metadata.position
-            }
-
             if (track) {
-                if ('image' in track) {
-                     player.cover_art = track.image
-                }
-
                 player.title = track.title
                 player.album = track.album
                 player.artist = track.artist
@@ -77,6 +68,10 @@ ApplicationWindow {
                      playlistview.currentIndex = track.index
                 }
             }
+
+            if ('position' in metadata) {
+                player.position = metadata.position
+            }
         }
     }
 
@@ -105,13 +100,12 @@ 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.cover_art ? player.cover_art : ''
+                source: AlbumArt
                 visible: player.av_connected === false
             }
 
@@ -201,6 +195,7 @@ ApplicationWindow {
                             id: previous
                             offImage: './images/AGL_MediaPlayer_BackArrow.svg'
                             onClicked: {
+                                radio.stop()
                                 mediaplayer.previous()
                             }
                         }
@@ -213,7 +208,6 @@ ApplicationWindow {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
                                         onClicked: {
-                                            player.status = "stopped"
                                             mediaplayer.pause()
                                         }
                                     }
@@ -223,7 +217,10 @@ ApplicationWindow {
                                     PropertyChanges {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Play.svg'
-                                        onClicked: mediaplayer.play()
+                                        onClicked: {
+                                            radio.stop()
+                                            mediaplayer.play()
+                                        }
                                     }
                                 }
                             ]
@@ -232,6 +229,7 @@ ApplicationWindow {
                             id: forward
                             offImage: './images/AGL_MediaPlayer_ForwardArrow.svg'
                             onClicked: {
+                                radio.stop()
                                 mediaplayer.next()
                             }
                         }
@@ -247,8 +245,9 @@ ApplicationWindow {
                                 else
                                         mediaplayer.disconnect()
                               }
-                              offImage: './images/AGL_MediaPlayer_Bluetooth_Inactive.svg'
-                              onImage: './images/AGL_MediaPlayer_Bluetooth_Active.svg'
+                              contentItem: Image {
+                                source: player.av_connected ? './images/AGL_MediaPlayer_Bluetooth_Active.svg' : './images/AGL_MediaPlayer_Bluetooth_Inactive.svg'
+                              }
                         }
                     }
                 }
@@ -300,6 +299,7 @@ ApplicationWindow {
                         //}
                     }
                     onClicked: {
+                        radio.stop()
                         mediaplayer.picktrack(playlistview.model[index].index)
                     }
                 }