[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-mediacenter/PMC/0.9] /: More play/pause/stop state tweaks
From:       Shantanu Tushar <shaan7in () gmail ! com>
Date:       2012-04-16 18:23:47
Message-ID: 20120416182347.BB24DA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 557c68534fbc447131da627063e396cd8c1d7b67 by Shantanu Tushar.
Committed on 16/04/2012 at 20:23.
Pushed by shantanu into branch 'PMC/0.9'.

More play/pause/stop state tweaks

M  +1    -1    components/mediacontroller/MediaController.qml
M  +2    -0    components/mediaplayer/MediaPlayer.qml
M  +4    -4    components/runtimedata/RuntimeData.qml
M  +3    -1    shells/newshell/package/contents/ui/mediacenter.qml

http://commits.kde.org/plasma-mediacenter/557c68534fbc447131da627063e396cd8c1d7b67

diff --git a/components/mediacontroller/MediaController.qml \
b/components/mediacontroller/MediaController.qml index be645e7..ee06a70 100644
--- a/components/mediacontroller/MediaController.qml
+++ b/components/mediacontroller/MediaController.qml
@@ -72,7 +72,7 @@ PlasmaCore.FrameSvgItem {
             onClicked: {
                 if (runtimeDataObject.playing) {
                     runtimeDataObject.playing = false; runtimeDataObject.paused = \
                true;
-                } else if (runtimeDataObject.paused) {
+                } else if (runtimeDataObject.paused || runtimeDataObject.stopped) {
                     runtimeDataObject.playing = true; runtimeDataObject.paused = \
false;  }
             }
diff --git a/components/mediaplayer/MediaPlayer.qml \
b/components/mediaplayer/MediaPlayer.qml index cf6f6bc..dceaa8a 100644
--- a/components/mediaplayer/MediaPlayer.qml
+++ b/components/mediaplayer/MediaPlayer.qml
@@ -33,12 +33,14 @@ FocusScope {
 
     signal clicked
     signal mediaFinished
+    signal mediaStarted
 
     QtMultimediaKit.Video {
         id: video
         anchors.fill: parent
 
         onStopped: mediaPlayerRootRect.mediaFinished()
+        onStarted: mediaPlayerRootRect.mediaStarted()
     }
 
     onPlayingChanged: if (playing) video.play();
diff --git a/components/runtimedata/RuntimeData.qml \
b/components/runtimedata/RuntimeData.qml index 935c3ac..800d103 100644
--- a/components/runtimedata/RuntimeData.qml
+++ b/components/runtimedata/RuntimeData.qml
@@ -30,7 +30,7 @@ Item {
     property bool currentTimeDirty: false
     property real volume: 1.0
 
-    onStoppedChanged: playing = !stopped
-    onPausedChanged: playing = !paused
-    onPlayingChanged: { paused = !playing; if (playing) stopped = false; }
-}
\ No newline at end of file
+    onStoppedChanged: if (stopped) playing = false
+    onPausedChanged: if (paused) playing = false
+    onPlayingChanged: if (playing) { paused = false; stopped = false }
+}
diff --git a/shells/newshell/package/contents/ui/mediacenter.qml \
b/shells/newshell/package/contents/ui/mediacenter.qml index 1ba8f44..c980e7b 100644
--- a/shells/newshell/package/contents/ui/mediacenter.qml
+++ b/shells/newshell/package/contents/ui/mediacenter.qml
@@ -69,13 +69,14 @@ Rectangle {
         }
 
         onMediaFinished: runtimeData.stopped = true
+        onMediaStarted: runtimeData.playing = true
     }
 
     MediaCenterComponents.MediaController {
         id: mediaController
         height: parent.height * 0.08
         width: parent.width * 0.8
-        visible: !mediaWelcome.visible
+
         anchors {
             horizontalCenter: parent.horizontalCenter; top: parent.top
         }
@@ -96,6 +97,7 @@ Rectangle {
         }
 
         onBackendSelected: { runtimeData.currentBrowsingBackend = selectedBackend; \
visible = false } +        onVisibleChanged: mediaController.visible = !visible
     }
 
     MediaCenterComponents.MediaBrowser {


[prev in list] [next in list] [prev in thread] [next in thread]