encrised prefinish mark

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1630 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 5 insertions, 3 deletions

diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index 43a97a56a..33970fea3 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -24,7 +24,7 @@
 #include "statehandler.h"
 
 #define TICK_INTERVAL 250
-#define PREFINISH_TIME 2000
+#define PREFINISH_TIME 6000
 
 StateHandler* StateHandler::m_instance = 0;
 
@@ -70,7 +70,8 @@ void StateHandler::dispatch(qint64 elapsed,
                  && m_sendAboutToFinish)
         {
             m_sendAboutToFinish = false;
-            emit aboutToFinish();
+            if(SoundCore::instance()->totalTime() - m_elapsed > PREFINISH_TIME/2)
+                emit aboutToFinish();
         }
     }
     if (m_frequency != frequency)
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index 0174003fa..9b4d9549d 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -202,9 +202,10 @@ void MediaPlayer::updateNextUrl()
 {
     if(m_pl_manager->currentPlayList()->nextItem() && !isRepeatable())
     {
+        qDebug("MediaPlayer: sending next url");
         m_core->play(m_pl_manager->currentPlayList()->nextItem()->url(), true);
         m_nextUrl = m_pl_manager->currentPlayList()->nextItem()->url();
-        qDebug("MediaPlayer: sending next url");
+        qDebug("MediaPlayer: sending next url - done");
     }
     else
         m_nextUrl.clear();