cleanup & fix crash on project saving with Qt 4.5:

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index fe703925bf6e4b449b70c88b873fc21e65f7b45c..b141e7cc68c00e48405529e0d1d94009e0d6782f 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -21,11 +21,14 @@
 #ifndef MONITOR_H
 #define MONITOR_H
 
+#include <QLabel>
+
 #include <KIcon>
 #include <KAction>
 #include <KRestrictedLine>
 #include <QDomElement>
 
+#include "gentime.h"
 #include "ui_monitor_ui.h"
 
 class MonitorManager;
@@ -44,17 +47,34 @@ private:
     Render *m_renderer;
 };
 
+class Overlay : public QLabel {
+    Q_OBJECT
+public:
+    Overlay(QWidget* parent);
+    virtual void paintEvent(QPaintEvent * event);
+    void setOverlayText(const QString &, bool isZone = true);
+
+private:
+    bool m_isZone;
+};
+
 class Monitor : public QWidget {
     Q_OBJECT
 
 public:
     Monitor(QString name, MonitorManager *manager, QWidget *parent = 0);
+    virtual ~Monitor();
     Render *render;
     void resetProfile();
     QString name() const;
     void resetSize();
     bool isActive() const;
     void pause();
+    void setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu = NULL);
+    const QString sceneList();
+    DocClipBase *activeClip();
+    GenTime position();
+    void checkOverlay();
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -83,12 +103,15 @@ private:
     KRestrictedLine *m_timePos;
     QAction *m_playAction;
     QMenu *m_contextMenu;
+    QMenu *m_configMenu;
+    QMenu *m_playMenu;
     DocClipBase *m_currentClip;
     QPoint m_DragStartPosition;
     bool m_dragStarted;
+    Overlay *m_overlay;
+    GenTime getSnapForPos(bool previous);
 
 private slots:
-    void adjustRulerSize(int length);
     void seekCursor(int pos);
     void rendererStopped(int pos);
     void slotExtractCurrentFrame();
@@ -97,6 +120,7 @@ private slots:
     void slotSetSizeOneToTwo();
     void slotSaveZone();
     void slotSeek();
+    void setClipZone(QPoint pos);
 
 public slots:
     void slotOpenFile(const QString &);
@@ -112,8 +136,8 @@ public slots:
     void slotLoopZone();
     void slotForward(double speed = 0);
     void slotRewind(double speed = 0);
-    void slotRewindOneFrame();
-    void slotForwardOneFrame();
+    void slotRewindOneFrame(int diff = 1);
+    void slotForwardOneFrame(int diff = 1);
     void saveSceneList(QString path, QDomElement info = QDomElement());
     void slotStart();
     void slotEnd();
@@ -122,6 +146,9 @@ public slots:
     void slotZoneStart();
     void slotZoneEnd();
     void slotZoneMoved(int start, int end);
+    void slotSeekToNextSnap();
+    void slotSeekToPreviousSnap();
+    void adjustRulerSize(int length);
 
 signals:
     void renderPosition(int);