Add Mac OS X compatibility through new MLT sdl_audio consumer and a QTGLWidget!

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index 34091bd0f8e8b60baa17025bb8f0fa5d4b6f251d..9d7723f381bd69a0d5ef863400604385fa44e731 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;
@@ -78,6 +81,7 @@ public:
     DocClipBase *activeClip();
     GenTime position();
     void checkOverlay();
+    void updateTimecodeFormat();
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -93,26 +97,29 @@ protected:
 
 private:
     Ui::Monitor_UI m_ui;
-    MonitorManager *m_monitorManager;
-    MonitorRefresh *m_monitorRefresh;
     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;
     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 seekCursor(int pos);
@@ -125,12 +132,13 @@ private slots:
     void slotSeek();
     void setClipZone(QPoint pos);
     void slotSwitchMonitorInfo(bool show);
+    void slotSwitchDropFrames(bool show);
 
 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();
@@ -153,6 +161,7 @@ public slots:
     void slotSeekToNextSnap();
     void slotSeekToPreviousSnap();
     void adjustRulerSize(int length);
+    void setTimePos(const QString &pos);
 
 signals:
     void renderPosition(int);
@@ -161,6 +170,7 @@ signals:
     void adjustMonitorSize();
     void zoneUpdated(QPoint);
     void saveZone(Render *, QPoint);
+    void blockMonitors();
 };
 
 #endif