X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=ff6b88fbe907bc0d538d054753c2ae0644ec9a56;hb=b72003117bc6322414a01a4c8148575cfa089a9f;hp=79cb5b69ad889244c5ed3eddf578eab4368e5a8e;hpb=b8421eb0562ff039790def1b31a4fc6c66676380;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index 79cb5b69..ff6b88fb 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -30,6 +30,7 @@
 
 #include "gentime.h"
 #include "ui_monitor_ui.h"
+#include "timecodedisplay.h"
 #ifdef Q_WS_MAC
 #include "videoglwidget.h"
 #endif
@@ -38,13 +39,16 @@ class MonitorManager;
 class Render;
 class SmallRuler;
 class DocClipBase;
+class MonitorScene;
+class QGraphicsView;
+class QGraphicsPixmapItem;
 
 class MonitorRefresh : public QWidget
 {
     Q_OBJECT
 public:
-    MonitorRefresh(QWidget* parent);
-    virtual void paintEvent(QPaintEvent * event);
+    MonitorRefresh(QWidget *parent = 0);
+    virtual void paintEvent(QPaintEvent *event);
     void setRenderer(Render* render);
 
 private:
@@ -56,7 +60,6 @@ class Overlay : public QLabel
     Q_OBJECT
 public:
     Overlay(QWidget* parent);
-    virtual void paintEvent(QPaintEvent * event);
     void setOverlayText(const QString &, bool isZone = true);
 
 private:
@@ -83,6 +86,7 @@ public:
     void checkOverlay();
     void updateTimecodeFormat();
     void updateMarkers(DocClipBase *source);
+    MonitorScene *getEffectScene();
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -92,9 +96,7 @@ protected:
      *
      * Moves towards the end of the clip/timeline on mouse wheel down/back, the
      * opposite on mouse wheel up/forward.
-     * Ctrl + wheel moves by a single frame, without Ctrl it moves by a second.
-     *
-     * See also http://www.kdenlive.org/mantis/view.php?id=265. */
+     * Ctrl + wheel moves by a second, without Ctrl it moves by a single frame. */
     virtual void wheelEvent(QWheelEvent * event);
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual QStringList mimeTypes() const;
@@ -118,18 +120,19 @@ private:
     MonitorRefresh *m_monitorRefresh;
     KIcon m_playIcon;
     KIcon m_pauseIcon;
-    KRestrictedLine *m_timePos;
+    TimecodeDisplay *m_timePos;
     QAction *m_playAction;
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
     QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
+    MonitorScene *m_effectScene;
+    QGraphicsView *m_effectView;
 #ifdef Q_WS_MAC
     VideoGLWidget *m_glWidget;
 #endif
     GenTime getSnapForPos(bool previous);
-    bool m_frametimecode;
 
 private slots:
     void seekCursor(int pos);
@@ -174,6 +177,8 @@ public slots:
     void adjustRulerSize(int length);
     void setTimePos(const QString &pos);
     QStringList getZoneInfo() const;
+    void slotEffectScene(bool show = true);
+    bool effectSceneDisplayed();
 
 signals:
     void renderPosition(int);
@@ -182,6 +187,9 @@ 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.
+     *      This causes a major slowdown, so we only enable it if required */
+    void requestFrameForAnalysis(bool);
 };
 
 #endif