X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=f246af70d1b8645b75b9e56e627d3788032b0874;hb=dd05682ae938bf7afa01943ffaa24d499e7f424d;hp=516c7679f3f76cc1ca3466e49123754aef32ba84;hpb=7bdee3646c2dfbd8366093c8c9c6b8d675fa5bf1;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index 516c7679..f246af70 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -30,13 +30,17 @@
 
 #include "gentime.h"
 #include "ui_monitor_ui.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,7 +51,8 @@ private:
     Render *m_renderer;
 };
 
-class Overlay : public QLabel {
+class Overlay : public QLabel
+{
     Q_OBJECT
 public:
     Overlay(QWidget* parent);
@@ -58,23 +63,26 @@ 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, QMenu *markerMenu = NULL);
-    QDomDocument sceneList();
+    void setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu = NULL);
+    const QString sceneList();
     DocClipBase *activeClip();
     GenTime position();
     void checkOverlay();
+    void updateTimecodeFormat();
+    void updateMarkers(DocClipBase *source);
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -89,30 +97,33 @@ 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;
+    QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
-    bool m_dragStarted;
-    Overlay *m_overlay;
+#ifdef Q_WS_MAC
+    VideoGLWidget *m_glWidget;
+#endif
     GenTime getSnapForPos(bool previous);
+    bool m_frametimecode;
 
 private slots:
-    void adjustRulerSize(int length);
     void seekCursor(int pos);
     void rendererStopped(int pos);
     void slotExtractCurrentFrame();
@@ -121,12 +132,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();
@@ -136,8 +151,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();
@@ -148,6 +163,9 @@ public slots:
     void slotZoneMoved(int start, int end);
     void slotSeekToNextSnap();
     void slotSeekToPreviousSnap();
+    void adjustRulerSize(int length);
+    void setTimePos(const QString &pos);
+    QStringList getZoneInfo() const;
 
 signals:
     void renderPosition(int);