[Kdenlive-svn] SF.net SVN: kdenlive:[4222] trunk/kdenlive/src

[<j-...@us...>]

Revision: 4222
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4222&view=rev
Author:   j-b-m
Date:     2010-01-10 18:47:37 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
fix fps issues

Modified Paths:
--------------
    trunk/kdenlive/src/smallruler.cpp
    trunk/kdenlive/src/timecode.cpp

Modified: trunk/kdenlive/src/smallruler.cpp
===================================================================
--- trunk/kdenlive/src/smallruler.cpp	2010-01-10 14:55:43 UTC (rev 4221)
+++ trunk/kdenlive/src/smallruler.cpp	2010-01-10 18:47:37 UTC (rev 4222)
@@ -123,10 +123,10 @@
 
 bool SmallRuler::slotNewValue(int value)
 {
+    if (value == m_cursorFramePosition) return false;
     m_cursorFramePosition = value;
     int oldPos = m_cursorPosition;
     m_cursorPosition = value * m_scale;
-    if (oldPos == m_cursorPosition) return false;
     const int offset = 6;
     const int x = qMin(oldPos, m_cursorPosition);
     const int w = qAbs(oldPos - m_cursorPosition);

Modified: trunk/kdenlive/src/timecode.cpp
===================================================================
--- trunk/kdenlive/src/timecode.cpp	2010-01-10 14:55:43 UTC (rev 4221)
+++ trunk/kdenlive/src/timecode.cpp	2010-01-10 18:47:37 UTC (rev 4222)
@@ -102,7 +102,7 @@
 QString Timecode::getStringTimecode(int frames, const double &fps)
 {
     // Returns the timecode in an hh:mm:ss format
-    int seconds = frames / (int) floor(fps + 0.5);
+    int seconds = (int) (frames / fps);
     int minutes = seconds / 60;
     seconds = seconds % 60;
     int hours = minutes / 60;
@@ -121,9 +121,9 @@
 QString Timecode::getEasyTimecode(const GenTime & time, const double &fps)
 {
     // Returns the timecode in an easily read display, like 3 min. 5 sec.
-    int frames = (int)time.frames(fps);
-    int seconds = frames / (int) floor(fps + 0.5);
-    frames = frames % ((int) fps);
+    int frames = (int) time.frames(fps);
+    int seconds = (int) (frames / fps);
+    frames = frames - ((int) (fps * seconds));
 
     int minutes = seconds / 60;
     seconds = seconds % 60;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.