X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=978e080d01d9ec944d5b3cf37d22b919ef97a75b;hb=b0dc9ee0a5365915e45c956fe8b61a1732ac36ee;hp=accd3aac0a6b8eb9eeb8977d45b6963511fba48e;hpb=6e140f856eeee8a9fd21797b711e93c0846d88fe;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index accd3aac..978e080d 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -30,6 +30,9 @@
 
 #include "gentime.h"
 #include "ui_monitor_ui.h"
+#ifdef Q_WS_MAC
+#include "videoglwidget.h"
+#endif
 
 class MonitorManager;
 class Render;
@@ -65,10 +68,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,6 +81,8 @@ public:
     DocClipBase *activeClip();
     GenTime position();
     void checkOverlay();
+    void updateTimecodeFormat();
+    void updateMarkers(DocClipBase *source);
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -101,7 +106,6 @@ private:
     bool m_isActive;
     double m_scale;
     int m_length;
-    int m_position;
     bool m_dragStarted;
     MonitorRefresh *m_monitorRefresh;
     KIcon m_playIcon;
@@ -111,8 +115,13 @@ private:
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
+    QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
+#ifdef Q_WS_MAC
+    VideoGLWidget *m_glWidget;
+#endif
     GenTime getSnapForPos(bool previous);
+    bool m_frametimecode;
 
 private slots:
     void seekCursor(int pos);
@@ -126,12 +135,13 @@ 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 initMonitor();
-    void refreshMonitor(bool visible);
+    void refreshMonitor(bool visible = true);
     void slotSeek(int pos);
     void stop();
     void start();
@@ -163,6 +173,7 @@ signals:
     void adjustMonitorSize();
     void zoneUpdated(QPoint);
     void saveZone(Render *, QPoint);
+    void blockMonitors();
 };
 
 #endif