cleanup

svn path=/trunk/kdenlive/; revision=3535

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 1b6d97672083069645799ae73e3658019af70c68..154014d68af8c6a565ec26724197b9f8b2816596 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -184,7 +184,7 @@ QPixmap KThumb::getImage(KUrl url, int width, int height)
 
 void KThumb::extractImage(int frame, int frame2)
 {
-    kDebug() << "//extract thumb: " << frame << ", " << frame2;
+    // kDebug() << "//extract thumb: " << frame << ", " << frame2;
     if (m_url.isEmpty() || !KdenliveSettings::videothumbnails() || m_producer == NULL) return;
 
     const int twidth = (int)(KdenliveSettings::trackheight() * m_dar);

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 092de52e406825ffce5a70ea3376e6b6b212e22d..b443ac95999b7fd2504c7bbdc2d5a33ab894c8bc 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -47,6 +47,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
         m_name(name),
         m_isActive(false),
         m_currentClip(NULL),
+        m_length(0),
+        m_position(-1),
         m_dragStarted(false),
         m_overlay(NULL)
 {
@@ -130,7 +132,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
     connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
 
     //render->createVideoXWindow(m_ui.video_frame->winId(), -1);
-    m_length = 0;
 
     if (name != "clip") {
         connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
@@ -456,10 +457,8 @@ void Monitor::slotSeek(int pos)
     activateMonitor();
     if (render == NULL) return;
     m_position = pos;
-    checkOverlay();
     render->seekToFrame(pos);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::checkOverlay()
@@ -484,7 +483,6 @@ void Monitor::slotStart()
     m_position = 0;
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotEnd()
@@ -494,7 +492,6 @@ void Monitor::slotEnd()
     m_position = render->getLength();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotZoneStart()
@@ -504,7 +501,6 @@ void Monitor::slotZoneStart()
     m_position = m_ruler->zone().x();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotZoneEnd()
@@ -514,7 +510,6 @@ void Monitor::slotZoneEnd()
     m_position = m_ruler->zone().y();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotRewind(double speed)
@@ -553,9 +548,7 @@ void Monitor::slotRewindOneFrame(int diff)
     int position = m_position - diff;
     m_position = qMax(position, 0);
     render->seekToFrame(m_position);
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
+    emit renderPosition(m_position)
 }
 
 void Monitor::slotForwardOneFrame(int diff)
@@ -567,8 +560,6 @@ void Monitor::slotForwardOneFrame(int diff)
     m_position = qMin(m_position, m_length);
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
 void Monitor::seekCursor(int pos)
@@ -585,7 +576,7 @@ void Monitor::rendererStopped(int pos)
     //int rulerPos = (int)(pos * m_scale);
     m_ruler->slotNewValue(pos);
     m_position = pos;
-    //checkOverlay();
+    checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
     m_playAction->setIcon(m_playIcon);

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 28c803ec169058fc2119ae15bbfc50d267755201..7bfb8473bfa2c99b9df6af3ac79c7a05877c9400 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -866,14 +866,15 @@ void Render::setSceneList(QString playlist, int position)
     }*/
 
     m_fps = m_mltProducer->get_fps();
-    kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
-    connectPlaylist();
-    fillSlowMotionProducers();
     if (position != 0) {
-        //TODO: seek to correct place after opening project.
-        //  Needs to be done from another place since it crashes here.
+        // Seek to correct place after opening project.
         m_mltProducer->seek(position);
     }
+
+    kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
+    connectPlaylist();
+    fillSlowMotionProducers();
+
     m_isBlocked = false;
     blockSignals(false);
     emit refreshDocumentProducers();