fix no seekFinished if pause before seek(wrong connection)

cfsghost · Jun 10, 2015 · 6c7dbb6 · 6c7dbb6
1 parent f2275e0
commit 6c7dbb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/AVDemuxThread.cpp b/src/AVDemuxThread.cpp
@@ -199,7 +199,7 @@ void AVDemuxThread::seekInternal(qint64 pos, SeekType type)
         pauseInternal(false);
         emit requestClockPause(false); // need direct connection
         // direct connection is fine here
-        connect(watch_thread, SIGNAL(frameDelivered()), this, SLOT(frameDeliveredSeekOnPause()), Qt::DirectConnection);
+        connect(watch_thread, SIGNAL(seekFinished(qint64)), this, SLOT(seekOnPauseFinished()), Qt::DirectConnection);
     }
 }
 
@@ -332,11 +332,11 @@ void AVDemuxThread::nextFrame()
     pauseInternal(false);
 }
 
-void AVDemuxThread::frameDeliveredSeekOnPause()
+void AVDemuxThread::seekOnPauseFinished()
 {
     AVThread *thread = video_thread ? video_thread : audio_thread;
     Q_ASSERT(thread);
-    disconnect(thread, SIGNAL(frameDelivered()), this, SLOT(frameDeliveredSeekOnPause()));
+    disconnect(thread, SIGNAL(seekFinished(qint64)), this, SLOT(seekOnPauseFinished()));
     if (user_paused) {
         pause(true); // restore pause state
         emit requestClockPause(true); // need direct connection

diff --git a/src/AVDemuxThread.h b/src/AVDemuxThread.h
@@ -63,7 +63,7 @@ public slots:
     void seekFinished(qint64 timestamp);
 
 private slots:
-    void frameDeliveredSeekOnPause();
+    void seekOnPauseFinished();
     void frameDeliveredNextFrame();
     void onAVThreadQuit();