*Allow users to choose between SDL and OpenGL for monitor display

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index ff6b88fbe907bc0d538d054753c2ae0644ec9a56..7f7a7ba6f1f32a543b28735a971617ca691e6e7b 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -17,7 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-
 #ifndef MONITOR_H
 #define MONITOR_H
 
@@ -31,7 +30,7 @@
 #include "gentime.h"
 #include "ui_monitor_ui.h"
 #include "timecodedisplay.h"
-#ifdef Q_WS_MAC
+#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
 #include "videoglwidget.h"
 #endif
 
@@ -40,8 +39,12 @@ class Render;
 class SmallRuler;
 class DocClipBase;
 class MonitorScene;
+class AbstractClipItem;
+class Transition;
+class ClipItem;
 class QGraphicsView;
 class QGraphicsPixmapItem;
+class AudioSignal;
 
 class MonitorRefresh : public QWidget
 {
@@ -79,7 +82,7 @@ public:
     void resetSize();
     bool isActive() const;
     void pause();
-    void setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu = NULL);
+    void setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu = NULL, QAction *loopClip = NULL);
     const QString sceneList();
     DocClipBase *activeClip();
     GenTime position();
@@ -108,6 +111,7 @@ protected:
 
 private:
     Ui::Monitor_UI m_ui;
+    AudioSignal *m_audiosignal;
     QString m_name;
     MonitorManager *m_monitorManager;
     DocClipBase *m_currentClip;
@@ -122,6 +126,8 @@ private:
     KIcon m_pauseIcon;
     TimecodeDisplay *m_timePos;
     QAction *m_playAction;
+    /** Has to be available so we can enable and disable it. */
+    QAction *m_loopClipAction;
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
@@ -129,9 +135,16 @@ private:
     QPoint m_DragStartPosition;
     MonitorScene *m_effectScene;
     QGraphicsView *m_effectView;
-#ifdef Q_WS_MAC
+    /** Selected clip/transition in timeline. Used for looping it. */
+    AbstractClipItem *m_selectedClip;
+    /** true if selected clip is transition, false = selected clip is clip.
+     *  Necessary because sometimes we get two signals, e.g. we get a clip and we get selected transition = NULL. */
+    bool m_loopClipTransition;
+#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
     VideoGLWidget *m_glWidget;
+    bool createOpenGlWidget(QVBoxLayout *rendererBox, const QString profile);
 #endif
+
     GenTime getSnapForPos(bool previous);
 
 private slots:
@@ -151,7 +164,6 @@ private slots:
 public slots:
     void slotOpenFile(const QString &);
     void slotSetXml(DocClipBase *clip, QPoint zone = QPoint(), const int position = -1);
-    void initMonitor();
     void refreshMonitor(bool visible = true);
     void slotSeek(int pos);
     void stop();
@@ -160,6 +172,8 @@ public slots:
     void slotPlay();
     void slotPlayZone();
     void slotLoopZone();
+    /** @brief Loops the selected item (clip or transition). */
+    void slotLoopClip();
     void slotForward(double speed = 0);
     void slotRewind(double speed = 0);
     void slotRewindOneFrame(int diff = 1);
@@ -180,6 +194,11 @@ public slots:
     void slotEffectScene(bool show = true);
     bool effectSceneDisplayed();
 
+    /** @brief Sets m_selectedClip to @param item. Used for looping it. */
+    void slotSetSelectedClip(AbstractClipItem *item);
+    void slotSetSelectedClip(ClipItem *item);
+    void slotSetSelectedClip(Transition *item);
+
 signals:
     void renderPosition(int);
     void durationChanged(int);
@@ -187,7 +206,7 @@ signals:
     void adjustMonitorSize();
     void zoneUpdated(QPoint);
     void saveZone(Render *, QPoint);
-    /** @brief  Editing transitions / effects over the monitor requires thr renderer to send frames as QImage.
+    /** @brief  Editing transitions / effects over the monitor requires the renderer to send frames as QImage.
      *      This causes a major slowdown, so we only enable it if required */
     void requestFrameForAnalysis(bool);
 };