added video transitions, closes #4

Main.qml

@@ -5,8 +5,6 @@ import QtMultimedia 5.8
 Rectangle {
     // Main Container
     id: container
-    //width: 1920
-    //height: 1080
 
     LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
@@ -31,53 +29,116 @@ Rectangle {
     }
 
     // Set Font
-
     FontLoader {
         id: textFont; name: config.displayFont
     }
 
+    // Background Fill
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+    }
+
     // Set Background Image
-    Repeater {
+    Image {
-        model: screenModel
+        anchors.fill: parent
-        Background {
-            id: background
-            x: geometry.x
-            y: geometry.y
-            width: geometry.width
-            height: geometry.height
         source: config.background
         fillMode: Image.PreserveAspectCrop
     }
-    }
 
-    // Set Background Video
+    // Set Background Video1
     MediaPlayer {
-        id: mediaplayer
+        id: mediaplayer1
-        autoPlay: true
+        autoPlay: true; muted: true
-        muted: true
         playlist: Playlist {
-            id: playlist
+            id: playlist1
             playbackMode: Playlist.Random
-            onLoaded: {
+            onLoaded: { mediaplayer1.play() }
-                mediaplayer.play()
-            }
         }
     }
 
     VideoOutput {
+        id: video1
         fillMode: VideoOutput.PreserveAspectCrop
-        anchors.fill: parent
+        anchors.fill: parent; source: mediaplayer1
-        source: mediaplayer
+        MouseArea {
+            id: mouseArea1
+            anchors.fill: parent;
+            onPressed: {playlist1.shuffle(); playlist1.next();}
+        }
     }
 
+    // Set Background Video2
+    MediaPlayer {
+        id: mediaplayer2
+        autoPlay: true; muted: true
+        playlist: Playlist {
+            id: playlist2; playbackMode: Playlist.Random
+            //onLoaded: { mediaplayer2.play() }
+        }
+    }
+
+    VideoOutput {
+        id: video2
+        fillMode: VideoOutput.PreserveAspectCrop
+        anchors.fill: parent; source: mediaplayer2
+        opacity: 0
         MouseArea {
+            id: mouseArea2
+            enabled: false
             anchors.fill: parent;
-        onPressed: {
+			onPressed: {playlist2.shuffle(); playlist2.next();}
-            playlist.shuffle();
+        }
-            playlist.next();
+        Behavior on opacity {
+            enabled: true
+            NumberAnimation { easing.type: Easing.InOutQuad; duration: 3000 }
         }
     }
 
+    property MediaPlayer currentPlayer: mediaplayer1
+
+    // Timer event to handle fade between videos
+    Timer {
+        interval: 1000;
+        running: true; repeat: true
+        onTriggered: {
+            if (currentPlayer.duration != -1 && currentPlayer.position > currentPlayer.duration - 10000) { // pre load the 2nd player
+                if (video2.opacity == 0) { // toogle opacity
+                    mediaplayer2.play()
+                } else
+                    mediaplayer1.play()
+            }
+            if (currentPlayer.duration != -1 && currentPlayer.position > currentPlayer.duration - 3000) { // initiate transition
+                if (video2.opacity == 0) { // toogle opacity
+                    mouseArea1.enabled = false
+                    currentPlayer = mediaplayer2
+                    video2.opacity = 1
+                    triggerTimer.start()
+                    mouseArea2.enabled = true
+                } else {
+                    mouseArea2.enabled = false
+                    currentPlayer = mediaplayer1
+                    video2.opacity = 0
+                    triggerTimer.start()
+                    mouseArea1.enabled = true
+                }
+            }
+        }
+    }
+
+    Timer { // this timer waits for fade to stop and stops the video
+        id: triggerTimer
+        interval: 4000; running: false; repeat: false
+        onTriggered: {
+            if (video2.opacity == 1)
+                mediaplayer1.stop()
+            else
+                mediaplayer2.stop()
+        }
+    }
+
+
+
     // Clock and Login Area
     Rectangle {
         id: rectangle
@@ -381,13 +442,17 @@ Rectangle {
 
         // load and randomize playlist
         var time = parseInt(new Date().toLocaleTimeString(Qt.locale(),'h'))
-        if ( time >= 5 && time <= 17 )
+        if ( time >= 5 && time <= 17 ) {
-            playlist.load(Qt.resolvedUrl(config.background_day), 'm3u')
+            playlist1.load(Qt.resolvedUrl(config.background_day), 'm3u')
-        else
+            playlist2.load(Qt.resolvedUrl(config.background_day), 'm3u')
-            playlist.load(Qt.resolvedUrl(config.background_night), 'm3u')
+        } else {
+            playlist1.load(Qt.resolvedUrl(config.background_night), 'm3u')
+            playlist2.load(Qt.resolvedUrl(config.background_night), 'm3u')
+        }
 
         for (var k = 0; k < Math.ceil(Math.random() * 10) ; k++) {
-            playlist.shuffle()
+            playlist1.shuffle()
+            playlist2.shuffle()
         }
 
         if (config.showLoginButton == "false") {

generate_playlist.sh

@@ -7,8 +7,10 @@ night=open("playlist_night.m3u", "w")
 for x in json.load(sys.stdin):
 	for asset in x["assets"]:
 		if asset["timeOfDay"] == "night":
+			print "[+] night - " + asset["url"]
 			night.write(asset["url"]+"\n")
 		elif asset["timeOfDay"] == "day":
+			print "[+] day - " + asset["url"]
 			day.write(asset["url"]+"\n")
 		else:
 			print "Unknown time of day %s" % asset["timeOfDay"]