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

List:       kde-commits
Subject:    extragear/multimedia/kmplayer/src
From:       Koos Vriezen <koos.vriezen () gmail ! com>
Date:       2012-01-02 14:20:40
Message-ID: 20120102142040.30ECCAC7DB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1271090 by vriezen:

Do the 'expr' attribute evalutation also in case of restarting

In case the state was frozen before, the MsgStateFreeze signal should
inform the element.

 M  +8 -7      kmplayer_smil.cpp  


--- trunk/extragear/multimedia/kmplayer/src/kmplayer_smil.cpp #1271089:1271090
@@ -496,11 +496,6 @@
  * start, or restart in case of re-use, the durations
  */
 KDE_NO_EXPORT void Runtime::start () {
-    if (disabledByExpr (this)) {
-        timingstate = TimingsDisabled;
-        doFinish ();
-        return;
-    }
     if (begin_timer || duration_timer)
         element->init ();
     timingstate = timings_began;
@@ -789,12 +784,18 @@
 }
 
 KDE_NO_EXPORT void Runtime::propagateStart () {
-    timingstate = trans_in_dur ? TimingsTransIn : timings_started;
-    element->deliver (MsgEventStarting, element);
     if (begin_timer) {
         element->document ()->cancelPosting (begin_timer);
         begin_timer = NULL;
     }
+    if (disabledByExpr (this)) {
+        if (timings_freezed == timingstate)
+            element->message (MsgStateFreeze);
+        timingstate = TimingsDisabled;
+        return;
+    }
+    timingstate = trans_in_dur ? TimingsTransIn : timings_started;
+    element->deliver (MsgEventStarting, element);
     started_timer = element->document()->post (
             element, new Posting (element, MsgEventStarted));
 }
[prev in list] [next in list] [prev in thread] [next in thread]