Merging of scopes manager by Granjow (final merge)

[kdenlive] / src / scopes / colorscopes / abstractgfxscopewidget.cpp

diff --git a/src/scopes/colorscopes/abstractgfxscopewidget.cpp b/src/scopes/colorscopes/abstractgfxscopewidget.cpp
index 5c82fc227d058126cab6c740bec45d404ffb174a..430b33190524f4507ba120523c55f2dface65162 100644 (file)
--- a/src/scopes/colorscopes/abstractgfxscopewidget.cpp
+++ b/src/scopes/colorscopes/abstractgfxscopewidget.cpp
@@ -28,16 +28,9 @@
 
 const int REALTIME_FPS = 30;
 
-AbstractGfxScopeWidget::AbstractGfxScopeWidget(MonitorManager *manager, bool trackMouse, QWidget *parent) :
-        AbstractScopeWidget(trackMouse, parent),
-        m_manager(manager)
+AbstractGfxScopeWidget::AbstractGfxScopeWidget(bool trackMouse, QWidget *parent) :
+        AbstractScopeWidget(trackMouse, parent)
 {
-    m_activeRender = m_manager->activeRenderer();
-
-    bool b = true;
-    if (m_activeRender != NULL)
-        b &= connect(m_activeRender, SIGNAL(frameUpdated(QImage)), this, SLOT(slotRenderZoneUpdated(QImage)));
-    Q_ASSERT(b);
 }
 
 AbstractGfxScopeWidget::~AbstractGfxScopeWidget() { }
@@ -49,41 +42,13 @@ QImage AbstractGfxScopeWidget::renderScope(uint accelerationFactor)
 
 void AbstractGfxScopeWidget::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (!m_aAutoRefresh->isChecked() && m_activeRender) {
-        m_activeRender->sendFrameUpdate();
-    }
     AbstractScopeWidget::mouseReleaseEvent(event);
+    emit signalFrameRequest(widgetName());
 }
 
 
 ///// Slots /////
 
-void AbstractGfxScopeWidget::slotActiveMonitorChanged()
-{
-    if (m_activeRender) {
-        if (m_activeRender == m_manager->activeRenderer()) return;
-        bool b = true;
-        b &= m_activeRender->disconnect(this);
-        Q_ASSERT(b);
-    }
-    m_activeRender = m_manager->activeRenderer();
-
-    if (m_activeRender) {
-#ifdef DEBUG_AGSW
-    qDebug() << "Active monitor has changed in " << widgetName() << ". Is the clip monitor active now? " << m_activeRender->name();
-#endif
-        bool b = connect(m_activeRender, SIGNAL(frameUpdated(QImage)), this, SLOT(slotRenderZoneUpdated(QImage)));
-        Q_ASSERT(b);
-    }
-
-    // Update the scope for the new monitor.
-    forceUpdate(true);
-}
-
-void AbstractGfxScopeWidget::slotClearMonitor()
-{
-    m_activeRender = NULL;
-}
 
 void AbstractGfxScopeWidget::slotRenderZoneUpdated(QImage frame)
 {
@@ -93,8 +58,8 @@ void AbstractGfxScopeWidget::slotRenderZoneUpdated(QImage frame)
 
 void AbstractGfxScopeWidget::slotAutoRefreshToggled(bool autoRefresh)
 {
-    if (autoRefresh && m_activeRender) {
-        m_activeRender->sendFrameUpdate();
+    if (autoRefresh) {
+        emit signalFrameRequest(widgetName());
     }
 }