From 288364b4644ae41be94b0b38b9a508d1b494a1d7 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Fri, 14 Dec 2018 17:03:11 -0800
Subject: mediaplayer: fix UI handover between A2DP/AVRCP to local media

Bug-AGL: SPEC-1630
Change-Id: Ic9ad044a4bb0eba73d4db49ea3cf6752be1114f7
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 app/MediaPlayer.qml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/MediaPlayer.qml b/app/MediaPlayer.qml
index 7cca337..9562f14 100644
--- a/app/MediaPlayer.qml
+++ b/app/MediaPlayer.qml
@@ -59,10 +59,6 @@ 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
@@ -77,6 +73,10 @@ ApplicationWindow {
                      playlistview.currentIndex = track.index
                 }
             }
+
+            if ('position' in metadata) {
+                player.position = metadata.position
+            }
         }
     }
 
@@ -213,7 +213,6 @@ ApplicationWindow {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
                                         onClicked: {
-                                            player.status = "stopped"
                                             mediaplayer.pause()
                                         }
                                     }
@@ -247,8 +246,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'
+                              }
                         }
                     }
                 }
-- 
cgit 1.2.3-korg