Merge branch 'audioAlign'

[kdenlive] / src / effectstackview.cpp

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index a917ff7e00bf6861c9ddcc1a64781cf917b3a8d5..57c97da9d96e333ca2242818f73a540292e1f569 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -48,7 +48,7 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) :
 {
     m_ui.setupUi(this);
     QVBoxLayout *vbox1 = new QVBoxLayout(m_ui.frame);
-    m_effectedit = new EffectStackEdit(monitor, m_ui.frame);
+    //m_effectedit = new EffectStackEdit(monitor, m_ui.frame);
     m_ui.frame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
     vbox1->setContentsMargins(2, 0, 2, 0);
     vbox1->setSpacing(0);
@@ -512,9 +512,9 @@ void EffectStackView::slotCheckMonitorPosition(int renderPos)
 {
     if (m_trackMode || (m_clipref && renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) {
         if (!m_monitor->getEffectEdit()->getScene()->views().at(0)->isVisible())
-            m_monitor->slotEffectScene(true);
+            m_monitor->slotShowEffectScene(true);
     } else {
-        m_monitor->slotEffectScene(false);
+        m_monitor->slotShowEffectScene(false);
     }
 }