X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=6b0be9d30e4357a5db8e06d0cad7923e12e9af27;hb=6c43f987273f567fa7659d5a4ad3a5e73f6e5b73;hp=73a9ff7caca20972ea19c2334b8f48846758879b;hpb=9cebbfefb3320c9ff001ac3005b6ad33d1e4fcfd;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index 73a9ff7c..6b0be9d3 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -30,13 +30,18 @@
 
 #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 MonitorRefresh : public QWidget {
+class MonitorRefresh : public QWidget
+{
     Q_OBJECT
 public:
     MonitorRefresh(QWidget* parent);
@@ -47,68 +52,80 @@ private:
     Render *m_renderer;
 };
 
-class Overlay : public QLabel {
+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 {
+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;
     void pause();
     void setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu = NULL);
-    QDomDocument sceneList();
+    const QString sceneList();
     DocClipBase *activeClip();
     GenTime position();
     void checkOverlay();
+    void updateTimecodeFormat();
+    void updateMarkers(DocClipBase *source);
 
 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 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;
+    TimecodeDisplay *m_timePos;
     QAction *m_playAction;
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
-    DocClipBase *m_currentClip;
+    QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
-    bool m_dragStarted;
-    Overlay *m_overlay;
+#ifdef Q_WS_MAC
+    VideoGLWidget *m_glWidget;
+#endif
     GenTime getSnapForPos(bool previous);
 
 private slots:
@@ -120,12 +137,16 @@ private slots:
     void slotSetSizeOneToTwo();
     void slotSaveZone();
     void slotSeek();
+    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);
+    void refreshMonitor(bool visible = true);
     void slotSeek(int pos);
     void stop();
     void start();
@@ -148,6 +169,8 @@ public slots:
     void slotSeekToNextSnap();
     void slotSeekToPreviousSnap();
     void adjustRulerSize(int length);
+    void setTimePos(const QString &pos);
+    QStringList getZoneInfo() const;
 
 signals:
     void renderPosition(int);