Speedup: only convert displayed frame to QImage if necessary (for on monitor scene...

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index df5d98baf3634b3cc3a217b908568c85512e4374..b7f8f143410a12aa62ff2d53b330c0e2f8782ba7 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -23,6 +23,7 @@
 #include "monitormanager.h"
 #include "smallruler.h"
 #include "docclipbase.h"
+#include "monitorscene.h"
 #include "kdenlivesettings.h"
 
 #include <KDebug>
@@ -39,6 +40,8 @@
 #include <QDesktopWidget>
 #include <QLabel>
 #include <QIntValidator>
+#include <QVBoxLayout>
+#include <QGraphicsView>
 
 
 Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) :
@@ -52,7 +55,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
         m_isActive(false),
         m_scale(1),
         m_length(0),
-        m_dragStarted(false)
+        m_dragStarted(false),
+        m_effectScene(NULL),
+        m_effectView(NULL)
 {
     m_ui.setupUi(this);
     QVBoxLayout *layout = new QVBoxLayout;
@@ -161,6 +166,16 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
 #ifndef Q_WS_MAC
     m_monitorRefresh->show();
 #endif
+
+    if (name == "project") {
+        m_effectScene = new MonitorScene(render);
+        m_effectView = new QGraphicsView(m_effectScene, m_ui.video_frame);
+        rendererBox->addWidget(m_effectView);
+        m_effectView->setMouseTracking(true);
+        m_effectScene->setUp();
+        m_effectView->hide();
+    }
+
     kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId();
 }
 
@@ -169,6 +184,10 @@ Monitor::~Monitor()
     delete m_ruler;
     delete m_timePos;
     delete m_overlay;
+    if (m_name == "project") {
+        delete m_effectView;
+        delete m_effectScene;
+    }
     delete m_monitorRefresh;
     delete render;
 }
@@ -504,7 +523,7 @@ void Monitor::setTimePos(const QString &pos)
 
 void Monitor::slotSeek()
 {
-    slotSeek(m_timePos->value());
+    slotSeek(m_timePos->getValue());
 }
 
 void Monitor::slotSeek(int pos)
@@ -760,6 +779,9 @@ void Monitor::resetProfile(const QString profile)
     m_timePos->updateTimeCode(m_monitorManager->timecode());
     if (render == NULL) return;
     render->resetProfile(profile);
+    if (m_effectScene) {
+        m_effectScene->resetProfile();
+    }
 }
 
 void Monitor::saveSceneList(QString path, QDomElement info)
@@ -818,7 +840,34 @@ QStringList Monitor::getZoneInfo() const
     return result;
 }
 
-MonitorRefresh::MonitorRefresh(QWidget* parent) : \
+void Monitor::slotEffectScene(bool show)
+{
+    if (m_name == "project") {
+#ifdef Q_WS_MAC
+        m_glWidget->setVisible(!show);
+#else
+        m_monitorRefresh->setVisible(!show);
+#endif
+        m_effectView->setVisible(show);
+        emit requestFrameForAnalysis(show);
+        if (show) {
+            render->doRefresh();
+            m_effectScene->slotZoomFit();
+        }
+    }
+}
+
+MonitorScene * Monitor::getEffectScene()
+{
+    return m_effectScene;
+}
+
+bool Monitor::effectSceneDisplayed()
+{
+    return m_effectView->isVisible();
+}
+
+MonitorRefresh::MonitorRefresh(QWidget* parent) :
         QWidget(parent),
         m_renderer(NULL)
 {
@@ -832,8 +881,9 @@ void MonitorRefresh::setRenderer(Render* render)
     m_renderer = render;
 }
 
-void MonitorRefresh::paintEvent(QPaintEvent * /*event*/)
+void MonitorRefresh::paintEvent(QPaintEvent *event)
 {
+    Q_UNUSED(event);
     if (m_renderer) m_renderer->doRefresh();
 }