[PATCH by Ray Lehtiniemi] Comment out variables used only in commented out code

[kdenlive] / src / transitionsettings.cpp

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index 6c6a91e8db00f36a545a8a87ddff4c5e60c7f237..cfa77d1ad0606b621f0c9a76eeae9fed0a2e4dd3 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -16,7 +16,6 @@
  ***************************************************************************/
 
 
-#include <KDebug>
 
 #include "transitionsettings.h"
 #include "transition.h"
@@ -25,6 +24,8 @@
 #include "kdenlivesettings.h"
 #include "mainwindow.h"
 
+#include <KDebug>
+
 TransitionSettings::TransitionSettings(QWidget* parent): QWidget(parent), m_tracksCount(0), m_usedTransition(NULL) {
     ui.setupUi(this);
     effectEdit = new EffectStackEdit(ui.frame);
@@ -60,22 +61,37 @@ void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t
 
 
 void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent) {
-    kDebug() << "// TRANSITION CHANGED, REINIT: " << reinit;
     QDomElement e = m_usedTransition->toXML().cloneNode().toElement();
     if (reinit) {
+        // Reset the transition parameters to the default one
         QDomElement newTransition = MainWindow::transitions.getEffectByName(ui.transitionList->currentText()).cloneNode().toElement();
         slotUpdateEffectParams(e, newTransition);
         emit transferParamDesc(newTransition, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
     } else if (!updateCurrent) {
+        // Transition changed, update parameters dialog
         //slotUpdateEffectParams(e, e);
         effectEdit->transferParamDesc(e, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
     } else {
+        // Same transition, we just want to update the parameters value
         slotUpdateEffectParams(e, e);
     }
 }
 
 void TransitionSettings::slotTransitionTrackChanged() {
-    emit transitionTrackUpdated(m_usedTransition, ui.transitionTrack->currentIndex());
+    if (m_usedTransition == NULL) return;
+    int ix = 0;
+    QDomElement oldxml = m_usedTransition->toXML().cloneNode().toElement();
+    if (ui.transitionTrack->currentIndex() > 0) {
+        ix = ui.transitionTrack->count() - ui.transitionTrack->currentIndex() - 1;
+        m_usedTransition->setForcedTrack(true, ix);
+        effectEdit->updateParameter("force_track", "1");
+        emit transitionUpdated(m_usedTransition, oldxml);
+    } else {
+        m_usedTransition->setForcedTrack(false, ix);
+        effectEdit->updateParameter("force_track", "0");
+        emit transitionUpdated(m_usedTransition, oldxml);
+    }
+    effectEdit->updateParameter("transition_btrack", QString::number(ix));
 }
 
 void TransitionSettings::slotTransitionItemSelected(Transition* t, bool update) {
@@ -114,20 +130,15 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, bool update)
 
 }
 
-void TransitionSettings::slotUpdateEffectParams(const QDomElement& oldparam, const QDomElement& param) {
+void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement &param) {
     if (m_usedTransition) {
-        bool forced = m_usedTransition->forcedTrack();
         m_usedTransition->setTransitionParameters(param);
-        m_usedTransition->setForcedTrack(forced, m_usedTransition->transitionEndTrack());
         m_usedTransition->update();
     }
-    /*QString test;
-    QTextStream str(&test);
-    oldparam.save(str, 2);
-    m_usedTransition->toXML().save(str, 2);*/
-    //kDebug() << test;
     //oldparam must be also first given to Transition and then return the toXML()
-    if (oldparam != param) emit transitionUpdated(m_usedTransition, oldparam);
+    if (oldparam != param) {
+        emit transitionUpdated(m_usedTransition, oldparam);
+    }
 }
 
 void TransitionSettings::raiseWindow(QWidget* dock) {