X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftimecode.h;h=23469756bbb8f3f4daec0f8e623a63243100da1c;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=8521aa822f28d29970b58ee163e6d3f54e51def6;hpb=5143c0fd6b774ee8a036427bb1630126270a6364;p=kdenlive

diff --git a/src/timecode.h b/src/timecode.h
index 8521aa82..23469756 100644
--- a/src/timecode.h
+++ b/src/timecode.h
@@ -21,9 +21,6 @@
 
 #include "gentime.h"
 
-class QValidator;
-class QRegExpValidator;
-
 /**
 Handles the conversion of a GenTime into a nicely formatted string, taking into account things such as drop frame if necessary. Handles multiple formats, such as HH:MM:SS:FF, HH:MM:SS:F, All Frames, All Seconds, etc.
 
@@ -34,14 +31,12 @@ class Timecode
 public:
     enum Formats { HH_MM_SS_FF, HH_MM_SS_HH, Frames, Seconds };
 
-    explicit Timecode(Formats format = HH_MM_SS_FF, double framesPerSecond = 25,
-                      bool dropFrame = false);
+    explicit Timecode(Formats format = HH_MM_SS_FF, double framesPerSecond = 25);
 
     /**
      * 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);
+    void setFormat(double framesPerSecond, Formats format = HH_MM_SS_FF);
 
     Formats format() const {
         return m_format;
@@ -52,32 +47,33 @@ public:
     /** 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;
+    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);
+    static QString getStringTimecode(int frames, const double &fps, bool showFrames = false);
     const QString getDisplayTimecodeFromFrames(int frames, bool frameDisplay) const;
     const QString getTimecodeFromFrames(int frames) const;
     double fps() const;
     bool df() const;
-    const QValidator *validator() const;
+    const QString mask(const GenTime &t = GenTime()) const;
     QString reformatSeparators(QString duration) const;
 
 private:
     Formats m_format;
-    bool m_dropFrame;
+    bool m_dropFrameTimecode;
     int m_displayedFramesPerSecond;
     double m_realFps;
-    QRegExpValidator *m_validator;
+    double m_dropFrames;
+    int m_framesPer10Minutes;
 
     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;
-    QString getTimecodeDropFrame(const GenTime & time) const;
-    QString getTimecodeDropFrame(int frames) const;
+    const QString getTimecodeHH_MM_SS_HH(const GenTime & time) const;
+    const QString getTimecodeFrames(const GenTime & time) const;
+    const QString getTimecodeSeconds(const GenTime & time) const;
+    const QString getTimecodeDropFrame(const GenTime & time) const;
+    const QString getTimecodeDropFrame(int framenumber) const;
 };
 
 #endif