cleanup

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

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index dafa9aea6435dc61befc291f0dd72f0b66427c5a..80037d38630e2d232e175a43e74cc7229ecb1e0b 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -229,10 +229,6 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
     KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/");
     KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/");
 
-    kDebug() << "Kdenlive document, init timecode: " << m_fps;
-    if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(m_fps, true);
-    else m_timecode.setFormat(m_fps);
-
     //kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString();
     connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave()));
 }
@@ -720,8 +716,8 @@ bool KdenliveDoc::setProfilePath(QString path)
     m_width = m_profile.width;
     m_height = m_profile.height;
     kDebug() << "Kdenlive document, init timecode from path: " << path << ",  " << m_fps;
-    if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(m_fps, true);
-    else m_timecode.setFormat(m_fps);
+    if (m_fps / 1.00 == (int)m_fps) m_timecode.setFormat(m_fps);
+    else m_timecode.setFormat(m_fps, true);
     return (current_fps != m_fps);
 }
 

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 25e5808c513bf05482013ba9bd83f11532a91c5a..5108ce4dc8fcee65fcbd4ba88914cb4fcb89074b 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -512,7 +512,6 @@ void Monitor::slotSeek(int pos)
     activateMonitor();
     if (render == NULL) return;
     render->seekToFrame(pos);
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::checkOverlay()
@@ -540,7 +539,6 @@ void Monitor::slotStart()
     activateMonitor();
     render->play(0);
     render->seekToFrame(0);
-    //emit renderPosition(0);
 }
 
 void Monitor::slotEnd()
@@ -548,7 +546,6 @@ void Monitor::slotEnd()
     activateMonitor();
     render->play(0);
     render->seekToFrame(render->getLength());
-    //emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneStart()
@@ -556,7 +553,6 @@ void Monitor::slotZoneStart()
     activateMonitor();
     render->play(0);
     render->seekToFrame(m_ruler->zone().x());
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneEnd()
@@ -564,7 +560,6 @@ void Monitor::slotZoneEnd()
     activateMonitor();
     render->play(0);
     render->seekToFrame(m_ruler->zone().y());
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotRewind(double speed)
@@ -596,7 +591,6 @@ void Monitor::slotRewindOneFrame(int diff)
     activateMonitor();
     render->play(0);
     render->seekToFrameDiff(-diff);
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotForwardOneFrame(int diff)
@@ -604,7 +598,6 @@ void Monitor::slotForwardOneFrame(int diff)
     activateMonitor();
     render->play(0);
     render->seekToFrameDiff(diff);
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::seekCursor(int pos)

diff --git a/src/timecodedisplay.cpp b/src/timecodedisplay.cpp
index 69c2690f3eae655c44b2046a16d89c72e25a9305..7c996ebfa057252ce0be817c452420af08c3f95e 100644 (file)
--- a/src/timecodedisplay.cpp
+++ b/src/timecodedisplay.cpp
@@ -123,10 +123,8 @@ int TimecodeDisplay::minimum() const
 
 int TimecodeDisplay::value() const
 {
-    int frames;
-    if (m_frametimecode) frames = lineedit->text().toInt();
-    else frames = m_timecode.getFrameCount(lineedit->text());
-    return frames;
+    if (m_frametimecode) return lineedit->text().toInt();
+    else return m_timecode.getFrameCount(lineedit->text());
 }
 
 GenTime TimecodeDisplay::gentime() const
@@ -164,8 +162,6 @@ void TimecodeDisplay::setValue(int value)
         lineedit->setText(QString::number(value));
     else
         lineedit->setText(m_timecode.getTimecodeFromFrames(value));
-
-    //emit valueChanged(value, true);
 }
 
 void TimecodeDisplay::setValue(GenTime value)