Merge pull request #3 from OpenVoiceOS/add_mycroft_player_and_positio…

…n_prop add player pos property and fix mycroft players for plugin
OpenVoiceOS · Aug 15, 2021 · bf35188 · bf35188
2 parents da1fb8c + d2c8e28
commit bf35188
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/ovos_workshop/res/ui/AudioPlayer.qml b/ovos_workshop/res/ui/AudioPlayer.qml
@@ -45,6 +45,13 @@ Mycroft.Delegate {
     property var playerState: media.status
     property var nextAction: "next"
     property var previousAction: "previous"
+    property var postionFromMetadata: media.position
+
+    onPositionFromMetadataChanged: {
+        if(playerState === "Playing"){
+            playerPosition = media.position
+        }
+    }
 
     onIsVerticalChanged: {
         if(isVertical){
@@ -299,4 +306,4 @@ Mycroft.Delegate {
             }
         }
     }
-}
+}
diff --git a/ovos_workshop/res/ui/MycroftAudioPlayer.qml b/ovos_workshop/res/ui/MycroftAudioPlayer.qml
@@ -177,7 +177,7 @@ Mycroft.CardDelegate {
             console.log("Image: " + root.thumbnail)
         }
     }
-
+    
     ColumnLayout {
         anchors.top: parent.top
         anchors.left: parent.left
@@ -444,8 +444,8 @@ Mycroft.CardDelegate {
             anchors.bottom: parent.bottom
             anchors.bottomMargin: Mycroft.Units.gridUnit * 0.5
             anchors.horizontalCenter: parent.horizontalCenter
-            anchors.leftMargin: parent.width * 0.05
-            anchors.rightMargin: parent.width * 0.11
+            anchors.leftMargin: parent.width * 0.11
+            anchors.rightMargin: parent.width * 0.16
 
             Row {
                 width: parent.width
@@ -557,3 +557,4 @@ Mycroft.CardDelegate {
         }
     }
 }
+
diff --git a/ovos_workshop/res/ui/MycroftSeekControl.qml b/ovos_workshop/res/ui/MycroftSeekControl.qml
@@ -290,4 +290,4 @@ Item {
         var seconds = ((millis % 60000) / 1000).toFixed(0);
         return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
     }
-}
+}
diff --git a/ovos_workshop/res/ui/MycroftVideoPlayer.qml b/ovos_workshop/res/ui/MycroftVideoPlayer.qml
@@ -226,3 +226,4 @@ Mycroft.Delegate {
         }
     }
 }
+
diff --git a/ovos_workshop/res/ui/images/media-playlist-shuffle.svg b/ovos_workshop/res/ui/images/media-playlist-shuffle.svg
diff --git a/ovos_workshop/res/ui/images/media-skip-backward.svg b/ovos_workshop/res/ui/images/media-skip-backward.svg
diff --git a/ovos_workshop/res/ui/images/media-skip-forward.svg b/ovos_workshop/res/ui/images/media-skip-forward.svg
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='ovos_workshop',
-    version='0.0.4a4',
+    version='0.0.4a5',
     packages=['ovos_workshop',
               'ovos_workshop.skills',
               'ovos_workshop.skills.decorators',
-Original file line number
+Diff line change
@@ Expand Up / @@ -290,4 +290,4 @@ Item { @@
             var seconds = ((millis % 60000) / 1000).toFixed(0);
             return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
         }
-    }
+    }