X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=2cffb9498dc72a68f191226852fd693d189da7e4;hb=6e179022124ff68b658451accce90c58931905dc;hp=6e989dc96af03e7c6faa70274e705f6c1f4d6a81;hpb=56f69242fee94baa6a0ed504b9cc51e0b5eb04ae;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index 6e989dc9..2cffb949 100644
--- 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;
@@ -33,7 +36,8 @@ class Render;
 class SmallRuler;
 class DocClipBase;
 
-class MonitorRefresh : public QWidget {
+class MonitorRefresh : public QWidget
+{
     Q_OBJECT
 public:
     MonitorRefresh(QWidget* parent);
@@ -44,19 +48,36 @@ private:
     Render *m_renderer;
 };
 
-class Monitor : public QWidget {
+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);
-    QDomDocument sceneList();
+    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);
@@ -71,28 +92,28 @@ protected:
 //    virtual void paintEvent(QPaintEvent * event);
 
 private:
-    Ui::Monitor_UI ui;
-    MonitorManager *m_monitorManager;
-    MonitorRefresh *m_monitorRefresh;
+    Ui::Monitor_UI m_ui;
     QString m_name;
+    MonitorManager *m_monitorManager;
+    DocClipBase *m_currentClip;
+    SmallRuler *m_ruler;
+    Overlay *m_overlay;
+    bool m_isActive;
     double m_scale;
     int m_length;
-    int m_position;
-    SmallRuler *m_ruler;
+    bool m_dragStarted;
+    MonitorRefresh *m_monitorRefresh;
     KIcon m_playIcon;
     KIcon m_pauseIcon;
-    bool m_isActive;
     KRestrictedLine *m_timePos;
     QAction *m_playAction;
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
-    DocClipBase *m_currentClip;
     QPoint m_DragStartPosition;
-    bool m_dragStarted;
+    GenTime getSnapForPos(bool previous);
 
 private slots:
-    void adjustRulerSize(int length);
     void seekCursor(int pos);
     void rendererStopped(int pos);
     void slotExtractCurrentFrame();
@@ -101,12 +122,15 @@ private slots:
     void slotSetSizeOneToTwo();
     void slotSaveZone();
     void slotSeek();
+    void setClipZone(QPoint pos);
+    void slotSwitchMonitorInfo(bool show);
+    void slotSwitchDropFrames(bool show);
 
 public slots:
     void slotOpenFile(const QString &);
     void slotSetXml(DocClipBase *clip, const int position = -1);
     void initMonitor();
-    void refreshMonitor(bool visible);
+    void refreshMonitor(bool visible = true);
     void slotSeek(int pos);
     void stop();
     void start();
@@ -116,8 +140,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();
@@ -126,6 +150,10 @@ public slots:
     void slotZoneStart();
     void slotZoneEnd();
     void slotZoneMoved(int start, int end);
+    void slotSeekToNextSnap();
+    void slotSeekToPreviousSnap();
+    void adjustRulerSize(int length);
+    void setTimePos(const QString &pos);
 
 signals:
     void renderPosition(int);
@@ -134,6 +162,7 @@ signals:
     void adjustMonitorSize();
     void zoneUpdated(QPoint);
     void saveZone(Render *, QPoint);
+    void blockMonitors();
 };
 
 #endif