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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/phonon
From:       Mark Kretschmann <markey () web ! de>
Date:       2007-05-05 16:56:24
Message-ID: 1178384184.618092.10076.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 661476 by markey:

totalTime() returns -1 when the engine is not yet ready, so we need to check that.


 M  +5 -13     phonon-engine.cpp  


--- trunk/extragear/multimedia/amarok/src/engine/phonon/phonon-engine.cpp #661475:661476
@@ -183,11 +183,8 @@
 uint
 PhononEngine::position() const
 {
-    if( state() != Engine::Empty && m_mediaObject ) { 
-        uint i = m_mediaObject->currentTime();
-        debug() << "Position: " << i << endl;
-        return i;
-    }
+    if( state() != Engine::Empty && m_mediaObject )
+        return m_mediaObject->currentTime();
 
     return 0;
 }
@@ -195,17 +192,12 @@
 uint
 PhononEngine::length() const
 {
-#if 0
     DEBUG_BLOCK
 
-    if( m_mediaObject ) {
-        const uint i = m_mediaObject->totalTime();
-        debug() << "Length: " << i << endl;
-        return i;
-    }
-#endif
+    const uint t = ( m_mediaObject->totalTime() == -1 ) ? 0 : m_mediaObject->totalTime();
+    debug() << "Length: " << t << endl;
 
-    return 0;
+    return t;
 }
 
 void
[prev in list] [next in list] [prev in thread] [next in thread]