- Fix handling of effects with multiple keyframable parameters during resize

- Fix compile

svn path=/trunk/kdenlive/; revision=4527

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 1d428a575899d14ca3800bc388de5e8482483294..5f1c6686b87d2894131a81b2f87bc4c3c9dfb659 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -1210,12 +1210,13 @@ void ClipItem::resizeEnd(int posx)
 
 bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart)
 {
-    bool modified = false;
+    bool effModified = false;
     for (int i = 0; i < m_effectList.count(); i++) {
         QDomElement effect = m_effectList.at(i);
         QDomNodeList params = effect.elementsByTagName("parameter");
         for (int j = 0; j < params.count(); j++) {
-            QDomElement e = params.item(i).toElement();
+            bool modified = false;
+            QDomElement e = params.item(j).toElement();
             if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
                 // parse keyframes and adjust values
                 const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
@@ -1238,6 +1239,7 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b
                     }
                 }
                 if (modified) {
+                    effModified = true;
                     QString newkfr;
                     QMap<int, double>::const_iterator k = kfr.constBegin();
                     while (k != kfr.constEnd()) {
@@ -1245,13 +1247,12 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b
                         ++k;
                     }
                     e.setAttribute("keyframes", newkfr);
-                    break;
                 }
             }
         }
     }
-    if (modified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect);
-    return modified;
+    if (effModified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect);
+    return effModified;
 }
 
 //virtual

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index de7e724e4a6b30b55e7891042696371be75bcc08..5e5fb3d7c66942d9289228bd07491348c557e9e6 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1385,7 +1385,7 @@ void CustomTrackView::editItemDuration()
     } else emit displayMessage(i18n("Item is locked"), ErrorMessage);
 }
 
-void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes)
+void CustomTrackView::editKeyFrame(const GenTime /*pos*/, const int /*track*/, const int /*index*/, const QString /*keyframes*/)
 {
     /*ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
     if (clip) {

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index f9b8012333fa3f763d0a88c9aab6139d1521ca2d..74535c3f2c1ae818fa473f6016824f1ce0a0f389 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -47,7 +47,7 @@ EffectStackView::EffectStackView(QWidget *parent) :
     vbox1->setSpacing(0);
     vbox1->addWidget(m_effectedit);
     m_ui.frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
-    m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions());
+    //m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions());
     //m_ui.effectlist->horizontalHeader()->setVisible(false);
     //m_ui.effectlist->verticalHeader()->setVisible(false);
     m_clipref = NULL;