Fix memory leak. Minor optimization

[kdenlive] / src / effectstackedit.cpp

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 85f6a2b1d07569cacf33845a356e383e37cd7e24..431c2c52930b87ca540c49f1f4ed4652c8984026 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -18,6 +18,7 @@
 #include "effectstackedit.h"
 #include "effectstack/effectstackview2.h"
 #include "effectslist.h"
+#include "monitor.h"
 #include "kdenlivesettings.h"
 
 #include <KDebug>
@@ -40,8 +41,6 @@
 
 EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) :
     QScrollArea(parent),
-    m_in(0),
-    m_out(0),
     m_paramWidget(NULL)
 {
     m_baseWidget = new QWidget(this);
@@ -70,13 +69,13 @@ Monitor *EffectStackEdit::monitor()
     return m_metaInfo.monitor;
 }
 
-void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t)
+void EffectStackEdit::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t)
 {
     m_metaInfo.profile = profile;
     m_metaInfo.timecode = t;
 }
 
-void EffectStackEdit::setFrameSize(QPoint p)
+void EffectStackEdit::setFrameSize(const QPoint &p)
 {
     m_metaInfo.frameSize = p;
 }
@@ -151,14 +150,14 @@ void EffectStackEdit::transferParamDesc(const QDomElement &d, ItemInfo info, boo
 {
     if (m_paramWidget) delete m_paramWidget;
     m_paramWidget = new ParameterContainer(d, info, &m_metaInfo, m_baseWidget);
-    connect (m_paramWidget, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)));
+    connect (m_paramWidget, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this, SIGNAL(parameterChanged(QDomElement,QDomElement,int)));
     
-    connect(m_paramWidget, SIGNAL(startFilterJob(QString,QString,QString,QString,QString,QString)), this, SIGNAL(startFilterJob(QString,QString,QString,QString,QString,QString)));
+    connect(m_paramWidget, SIGNAL(startFilterJob(QString,QString,QString,QString,QMap<QString,QString>)), this, SIGNAL(startFilterJob(QString,QString,QString,QString,QMap<QString,QString>)));
     
     connect (this, SIGNAL(syncEffectsPos(int)), m_paramWidget, SIGNAL(syncEffectsPos(int)));
     connect (m_paramWidget, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
     connect (m_paramWidget, SIGNAL(seekTimeline(int)), this, SIGNAL(seekTimeline(int)));
-    
+    connect (m_paramWidget, SIGNAL(importClipKeyframes()), this, SIGNAL(importClipKeyframes()));
     
     Q_FOREACH( QSpinBox * sp, m_baseWidget->findChildren<QSpinBox*>() ) {
         sp->installEventFilter( this );
@@ -172,8 +171,6 @@ void EffectStackEdit::transferParamDesc(const QDomElement &d, ItemInfo info, boo
        cb->installEventFilter( this );
         cb->setFocusPolicy( Qt::StrongFocus );
     }
-    
-    return;
 }
 
 void EffectStackEdit::slotSyncEffectsPos(int pos)
@@ -181,5 +178,17 @@ void EffectStackEdit::slotSyncEffectsPos(int pos)
     emit syncEffectsPos(pos);
 }
 
+bool EffectStackEdit::needsMonitorEffectScene() const
+{
+    if (!m_paramWidget) return false;
+    return m_paramWidget->needsMonitorEffectScene();
+}
+
+void EffectStackEdit::setKeyframes(const QString &data, int maximum)
+{
+    if (!m_paramWidget) return;
+    m_paramWidget->setKeyframes(data, maximum);
+}
 
 
+#include "effectstackedit.moc"