app/MediaPlayer: Do not hard-code the window size

[apps/mediaplayer.git] / app / MediaPlayer.qml

diff --git a/app/MediaPlayer.qml b/app/MediaPlayer.qml
index 089fcd0..cdd9368 100644 (file)
--- a/app/MediaPlayer.qml
+++ b/app/MediaPlayer.qml
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-import QtQuick 2.6
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
+import QtQuick 2.11
+import QtQuick.Layouts 1.11
+import QtQuick.Controls 2.4
+
+import QtQuick.Window 2.11
+
 import AGL.Demo.Controls 1.0
 
 ApplicationWindow {
@@ -40,7 +43,7 @@ ApplicationWindow {
         property string status: "stopped"
 
         function time2str(value) {
-            return Qt.formatTime(new Date(value), 'mm:ss')
+            return Qt.formatTime(new Date(value), (value > 3600000) ? 'hh:mm:ss' : 'mm:ss')
         }
     }
 
@@ -59,10 +62,14 @@ ApplicationWindow {
             }
 
             if (track) {
+                if ('image' in track)
+                     return
                 player.title = track.title
                 player.album = track.album
                 player.artist = track.artist
-                player.duration = track.duration
+
+                if ('duration' in track)
+                     player.duration = track.duration
 
                 if ('index' in track) {
                      playlistview.currentIndex = track.index
@@ -88,9 +95,10 @@ ApplicationWindow {
     Item {
         id: container
         anchors.centerIn: parent
-        width: 1080
-        height: 1487
-        scale: screenInfo.scale_factor()
+        width: Screen.width
+        height: Screen.height
+        //scale: screenInfo.scale_factor()
+        scale: 1
 
     ColumnLayout {
         anchors.fill: parent