On-Monitor effects:

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 876eb8f6385e5fa9102e2bd5d7b513337f72d980..a39e79111d938320d239e7f42dcbb8182daea71d 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,8 @@ 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_delStage(false)
 {
     m_ui.setupUi(this);
     QVBoxLayout *layout = new QVBoxLayout;
@@ -76,7 +80,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
     }
 
     toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind()));
-    toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame()));
+    //toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame()));
 
     QToolButton *playButton = new QToolButton(toolbar);
     m_playMenu = new QMenu(i18n("Play..."), this);
@@ -88,7 +92,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
     playButton->setPopupMode(QToolButton::MenuButtonPopup);
     toolbar->addWidget(playButton);
 
-    toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame()));
+    //toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame()));
     toolbar->addAction(KIcon("media-seek-forward"), i18n("Forward"), this, SLOT(slotForward()));
 
     playButton->setDefaultAction(m_playAction);
@@ -161,14 +165,29 @@ 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();
 }
 
 Monitor::~Monitor()
 {
+    m_delStage = true;
     delete m_ruler;
     delete m_timePos;
     delete m_overlay;
+    if (m_name == "project") {
+        delete m_effectView;
+        delete m_effectScene;
+    }
     delete m_monitorRefresh;
     delete render;
 }
@@ -512,7 +531,6 @@ void Monitor::slotSeek(int pos)
     activateMonitor();
     if (render == NULL) return;
     render->seekToFrame(pos);
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::checkOverlay()
@@ -540,7 +558,6 @@ void Monitor::slotStart()
     activateMonitor();
     render->play(0);
     render->seekToFrame(0);
-    //emit renderPosition(0);
 }
 
 void Monitor::slotEnd()
@@ -548,7 +565,6 @@ void Monitor::slotEnd()
     activateMonitor();
     render->play(0);
     render->seekToFrame(render->getLength());
-    //emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneStart()
@@ -556,7 +572,6 @@ void Monitor::slotZoneStart()
     activateMonitor();
     render->play(0);
     render->seekToFrame(m_ruler->zone().x());
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneEnd()
@@ -564,7 +579,6 @@ void Monitor::slotZoneEnd()
     activateMonitor();
     render->play(0);
     render->seekToFrame(m_ruler->zone().y());
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotRewind(double speed)
@@ -596,7 +610,6 @@ void Monitor::slotRewindOneFrame(int diff)
     activateMonitor();
     render->play(0);
     render->seekToFrameDiff(-diff);
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotForwardOneFrame(int diff)
@@ -604,7 +617,6 @@ void Monitor::slotForwardOneFrame(int diff)
     activateMonitor();
     render->play(0);
     render->seekToFrameDiff(diff);
-    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::seekCursor(int pos)
@@ -764,6 +776,7 @@ void Monitor::slotSaveZone()
 
 void Monitor::resetProfile(const QString profile)
 {
+    m_timePos->updateTimeCode(m_monitorManager->timecode());
     if (render == NULL) return;
     render->resetProfile(profile);
 }
@@ -824,6 +837,21 @@ QStringList Monitor::getZoneInfo() const
     return result;
 }
 
+void Monitor::slotEffectScene(bool show)
+{
+    if (m_name == "project" && !m_delStage) {
+        m_monitorRefresh->setVisible(!show);
+        m_effectView->setVisible(show);
+        if (show)
+            m_effectScene->slotUpdateBackground();
+    }
+}
+
+MonitorScene * Monitor::getEffectScene()
+{
+    return m_effectScene;
+}
+
 MonitorRefresh::MonitorRefresh(QWidget* parent) : \
         QWidget(parent),
         m_renderer(NULL)
@@ -838,8 +866,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();
 }