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

List:       kde-commits
Subject:    [dragon] src/app: dont seek before play, dont play in load, dont pause in seek
From:       Harald Sitter <sitter () kde ! org>
Date:       2012-05-31 22:00:59
Message-ID: 20120531220059.06CFEA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit a5a9a640c6adf1aeaa1698e9111b6135f7ca15f8 by Harald Sitter.
Committed on 01/06/2012 at 00:00.
Pushed by sitter into branch 'master'.

dont seek before play, dont play in load, dont pause in seek

WTF, srsly

M  +1    -12   src/app/videoWindow.cpp

http://commits.kde.org/dragon/a5a9a640c6adf1aeaa1698e9111b6135f7ca15f8

diff --git a/src/app/videoWindow.cpp b/src/app/videoWindow.cpp
index 62ab1a9..fa4c7f5 100644
--- a/src/app/videoWindow.cpp
+++ b/src/app/videoWindow.cpp
@@ -206,7 +206,6 @@ VideoWindow::load( const KUrl &url )
         m_media->setCurrentSource( url );
     m_justLoaded = true;
     m_adjustedSize=false;
-    engine()->play();
 
     QApplication::restoreOverrideCursor();
 
@@ -220,9 +219,9 @@ VideoWindow::play( qint64 offset )
     QApplication::setOverrideCursor( Qt::WaitCursor );
 
     m_justLoaded = false;
+    m_media->play();
     if( offset > 0 )
         seek( offset );
-    m_media->play();
     kDebug() << "Does this media have Video stream? " << TheStream::hasVideo();
 
     QApplication::restoreOverrideCursor();
@@ -424,16 +423,6 @@ VideoWindow::isMuted()
 void
 VideoWindow::seek( qint64 pos )
 {
-//    bool wasPaused = false;
-
-    // If we seek to the end the track ended event is sent, but it is
-    // delayed as it happens in xine-event loop and before that we are
-    // already processing the next seek event (if user uses mouse wheel
-    // or keyboard to seek) and this causes the ui to think video is
-    // stopped but xine is actually playing the track. Tada!
-    // TODO set state based on events from xine only
-
-      m_media->pause(); //pausing first gives Phonon a chance to recognize seekable media;
       m_media->seek( pos );
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]