X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=afdc611bffd723c25a9f5772d6b8f5c60da7b46b;hb=f61b5d4b1159e2e41c540022d876620ac3870667;hp=1b73d75518d7dfa8620c667fc39916fd6c906b15;hpb=edf2e497b4361db1bce089b0ef58dd566bf1d997;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index 1b73d755..afdc611b 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -30,18 +30,25 @@
 
 #include "gentime.h"
 #include "ui_monitor_ui.h"
+#include "timecodedisplay.h"
+#ifdef Q_WS_MAC
+#include "videoglwidget.h"
+#endif
 
 class MonitorManager;
 class Render;
 class SmallRuler;
 class DocClipBase;
+class MonitorScene;
+class QGraphicsView;
+class QGraphicsPixmapItem;
 
 class MonitorRefresh : public QWidget
 {
     Q_OBJECT
 public:
-    MonitorRefresh(QWidget* parent);
-    virtual void paintEvent(QPaintEvent * event);
+    MonitorRefresh(QWidget *parent = 0);
+    virtual void paintEvent(QPaintEvent *event);
     void setRenderer(Render* render);
 
 private:
@@ -53,7 +60,6 @@ class Overlay : public QLabel
     Q_OBJECT
 public:
     Overlay(QWidget* parent);
-    virtual void paintEvent(QPaintEvent * event);
     void setOverlayText(const QString &, bool isZone = true);
 
 private:
@@ -65,10 +71,10 @@ class Monitor : public QWidget
     Q_OBJECT
 
 public:
-    Monitor(QString name, MonitorManager *manager, QWidget *parent = 0);
+    Monitor(QString name, MonitorManager *manager, QString profile = QString(), QWidget *parent = 0);
     virtual ~Monitor();
     Render *render;
-    void resetProfile();
+    void resetProfile(const QString profile);
     QString name() const;
     void resetSize();
     bool isActive() const;
@@ -78,18 +84,27 @@ public:
     DocClipBase *activeClip();
     GenTime position();
     void checkOverlay();
+    void updateTimecodeFormat();
+    void updateMarkers(DocClipBase *source);
+    MonitorScene *getEffectScene();
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
+
+    /** @brief Move to another position on mouse wheel event.
+     *
+     * Moves towards the end of the clip/timeline on mouse wheel down/back, the
+     * opposite on mouse wheel up/forward.
+     * Ctrl + wheel moves by a second, without Ctrl it moves by a single frame. */
     virtual void wheelEvent(QWheelEvent * event);
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual QStringList mimeTypes() const;
-    /*    virtual void dragMoveEvent(QDragMoveEvent * event);
-        virtual Qt::DropActions supportedDropActions() const;*/
+    /*virtual void dragMoveEvent(QDragMoveEvent * event);
+    virtual Qt::DropActions supportedDropActions() const;*/
 
-//    virtual void resizeEvent(QResizeEvent * event);
-//    virtual void paintEvent(QPaintEvent * event);
+    //virtual void resizeEvent(QResizeEvent * event);
+    //virtual void paintEvent(QPaintEvent * event);
 
 private:
     Ui::Monitor_UI m_ui;
@@ -101,17 +116,22 @@ private:
     bool m_isActive;
     double m_scale;
     int m_length;
-    int m_position;
     bool m_dragStarted;
     MonitorRefresh *m_monitorRefresh;
     KIcon m_playIcon;
     KIcon m_pauseIcon;
-    KRestrictedLine *m_timePos;
+    TimecodeDisplay *m_timePos;
     QAction *m_playAction;
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
+    QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
+    MonitorScene *m_effectScene;
+    QGraphicsView *m_effectView;
+#ifdef Q_WS_MAC
+    VideoGLWidget *m_glWidget;
+#endif
     GenTime getSnapForPos(bool previous);
 
 private slots:
@@ -126,10 +146,11 @@ private slots:
     void setClipZone(QPoint pos);
     void slotSwitchMonitorInfo(bool show);
     void slotSwitchDropFrames(bool show);
+    void slotGoToMarker(QAction *action);
 
 public slots:
     void slotOpenFile(const QString &);
-    void slotSetXml(DocClipBase *clip, const int position = -1);
+    void slotSetXml(DocClipBase *clip, QPoint zone = QPoint(), const int position = -1);
     void initMonitor();
     void refreshMonitor(bool visible = true);
     void slotSeek(int pos);
@@ -155,6 +176,8 @@ public slots:
     void slotSeekToPreviousSnap();
     void adjustRulerSize(int length);
     void setTimePos(const QString &pos);
+    QStringList getZoneInfo() const;
+    void slotEffectScene(bool show = true);
 
 signals:
     void renderPosition(int);