Add subclips (dragging a zone from clip monitor to project tree)

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index 35b539e96ab48ba2d650413d324912ccd9217f87..1fb41d9ec9a98cce19e04b6fe3293575be337e2e 100644 (file)
--- 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;
@@ -79,6 +82,7 @@ public:
     GenTime position();
     void checkOverlay();
     void updateTimecodeFormat();
+    void updateMarkers(DocClipBase *source);
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -111,7 +115,11 @@ 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;
 
@@ -127,10 +135,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);