331 fixed: Naming of tracks now Audio 1, Video 1, etc. http://www.kdenlive.org/mantis...

[kdenlive] / src / markerdialog.h

diff --git a/src/markerdialog.h b/src/markerdialog.h
index 05225ccd1a4ab35fe7bb60ed27cd6117ff87b09e..a3867a2551de821d4835b9fce1c57da8dcb77b7c 100644 (file)
--- a/src/markerdialog.h
+++ b/src/markerdialog.h
@@ -21,22 +21,23 @@
 #ifndef MARKERDIALOG_H
 #define MARKERDIALOG_H
 
-#include <QDialog>
 
 #include "docclipbase.h"
 #include "timecode.h"
 #include "ui_markerdialog_ui.h"
 
-namespace Mlt {
+namespace Mlt
+{
 class Producer;
 class Profile;
 };
 
-class MarkerDialog : public QDialog {
+class MarkerDialog : public QDialog, public Ui::MarkerDialog_UI
+{
     Q_OBJECT
 
 public:
-    MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWidget * parent = 0);
+    MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent = 0);
     ~MarkerDialog();
     CommentedTime newMarker();
 
@@ -45,16 +46,18 @@ private slots:
     void slotTimeDown();
     void slotUpdateThumb();
 
+protected:
+    void wheelEvent(QWheelEvent * event);
+
 private:
     Mlt::Producer *m_producer;
     Mlt::Profile *m_profile;
-    Ui::MarkerDialog_UI m_view;
     DocClipBase *m_clip;
-    CommentedTime m_marker;
     Timecode m_tc;
     double m_fps;
     double m_dar;
     QTimer *m_previewTimer;
+    bool m_frameDisplay;
 
 signals:
     void updateThumb();