Fix dropframe timecode, patch from John T. Mertz

[kdenlive] / src / timecode.h

diff --git a/src/timecode.h b/src/timecode.h
index 3d310eb6df7e37a1e67528d971bd1a30e010be66..3fac06441cbaccbeafa7037c4f543322f766955e 100644 (file)
--- a/src/timecode.h
+++ b/src/timecode.h
@@ -36,10 +36,10 @@ public:
 
     /** Set the current timecode format; this is the output format for this timecode. */
     void setFormat(double framesPerSecond, bool dropFrame = false, Formats format = HH_MM_SS_FF) {
-        m_displayedFramesPerSecond = (int) (framesPerSecond + 0.5);
+        m_displayedFramesPerSecond = (int)(framesPerSecond + 0.5);
         m_dropFrame = dropFrame;
         m_format = format;
-       m_realFps = framesPerSecond;
+        m_realFps = framesPerSecond;
     }
 
     Formats format() const {
@@ -49,12 +49,18 @@ public:
     ~Timecode();
 
     /** Returns the timecode for a given time */
+    QString getDisplayTimecode(const GenTime & time, bool frameDisplay) const;
     QString getTimecode(const GenTime & time) const;
+    int getDisplayFrameCount(const QString duration, bool frameDisplay) const;
     int getFrameCount(const QString duration) const;
     static QString getEasyTimecode(const GenTime & time, const double &fps);
     static QString getStringTimecode(int frames, const double &fps);
-    QString getTimecodeFromFrames(int frames) const;
-    int fps() const;
+    const QString getDisplayTimecodeFromFrames(int frames, bool frameDisplay) const;
+    const QString getTimecodeFromFrames(int frames) const;
+    double fps() const;
+    bool df() const;
+    QString inputMask() const;
+    QString reformatSeparators(QString duration) const;
 
 private:
     Formats m_format;
@@ -62,9 +68,9 @@ private:
     int m_displayedFramesPerSecond;
     double m_realFps;
 
-    QString getTimecodeHH_MM_SS_FF(const GenTime & time) const;
-    QString getTimecodeHH_MM_SS_FF(int frames) const;
-    
+    const QString getTimecodeHH_MM_SS_FF(const GenTime & time) const;
+    const QString getTimecodeHH_MM_SS_FF(int frames) const;
+
     QString getTimecodeHH_MM_SS_HH(const GenTime & time) const;
     QString getTimecodeFrames(const GenTime & time) const;
     QString getTimecodeSeconds(const GenTime & time) const;