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

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Ian Monroe <ian.monroe () gmail ! com>
Date:       2007-05-24 4:08:53
Message-ID: 1179979733.740308.12689.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 667818 by ianmonroe:

 r9244@gomashio:  ian | 2007-05-20 11:50:06 -0500
 emit trackFinished when a track is finished.
 all the order* signals are deprecated. They will be removed with playlist.cpp 
 is removed.


 _M            . (directory)  
 M  +3 -3      src/enginecontroller.cpp  
 M  +2 -2      src/enginecontroller.h  


--- trunk/extragear/multimedia/amarok/src/enginecontroller.cpp #667817:667818
@@ -703,7 +703,7 @@
     {
         debug() << "Crossfading to next track...\n";
         m_engine->setXFadeNextTrack( true );
-        trackFinished();
+        trackDone();
     }
     else if ( m_engine->state() == Engine::Playing &&
               AmarokConfig::fadeout() &&
@@ -722,12 +722,12 @@
         //FIXME not perfect
         if ( !m_isTiming )
         {
-            QTimer::singleShot( AmarokConfig::trackDelayLength(), this, SLOT(trackFinished()) );
+            QTimer::singleShot( AmarokConfig::trackDelayLength(), this, SLOT(trackDone()) );
             m_isTiming = true;
         }
 
     }
-    else trackFinished();
+    else trackDone();
 }
 
 
--- trunk/extragear/multimedia/amarok/src/enginecontroller.h #667817:667818
@@ -73,7 +73,6 @@
     // forceNext make we go to next track even if Repeat Track is on
     //NOTE If the track ended normally, call next(false) !
     void next( const bool forceNext = true );
-    void trackFinished() { next(false); };
     void play();
     void play( const MetaBundle&, uint offset = 0 );
     void pause();
@@ -101,13 +100,14 @@
     void orderCurrent();
     void orderNext( const bool );
     void statusText( const QString& );
+    void trackFinished();
 
 private slots:
     void slotEngineMetaData( const Engine::SimpleMetaBundle& );
     void slotMainTimer();
     void slotTrackEnded();
     void slotStateChanged( Engine::State );
-
+    void trackDone() { emit trackFinished(); next(false); }
 protected:
     EngineController();
    ~EngineController();
[prev in list] [next in list] [prev in thread] [next in thread]