Fix moving transition sometimes losing properties: http://kdenlive.org/mantis/view...

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 512afae1c6b29923b57314528874e326bcea2543..7a4b95e822b0da9d797df68abdb5a7ca453f3598 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -239,8 +239,8 @@ void Render::buildConsumer(const QString &profileName)
             if (m_mltConsumer->is_valid()) {
                externalConsumer = true;
                 m_mltConsumer->set("terminate_on_pause", 0);
-                m_mltConsumer->set("deinterlace_method", "onefield");
-               m_mltConsumer->set("rescale", "nearest");
+                m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData());
+               m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData());
                m_mltConsumer->set("buffer", "1");
                 m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
             }
@@ -274,7 +274,7 @@ void Render::buildConsumer(const QString &profileName)
                    // Set defaults for decklink consumer
                    if (m_mltConsumer) {
                        m_mltConsumer->set("terminate_on_pause", 0);
-                       m_mltConsumer->set("deinterlace_method", "onefield");
+                       m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData());
                        externalConsumer = true;
                    }
                }
@@ -300,7 +300,7 @@ void Render::buildConsumer(const QString &profileName)
     }
     //m_mltConsumer->set("resize", 1);
     m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData());
-    m_mltConsumer->set("rescale", "nearest");
+    m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData());
     mlt_log_set_callback(kdenlive_callback);
 
     QString audioDevice = KdenliveSettings::audiodevicename();
@@ -1757,11 +1757,7 @@ void Render::setDropFrames(bool show)
         int dropFrames = KdenliveSettings::mltthreads();
         if (show == false) dropFrames = -dropFrames;
         m_mltConsumer->stop();
-        if (m_winid == 0)
-            m_mltConsumer->set("real_time", dropFrames);
-        else
-            m_mltConsumer->set("play.real_time", dropFrames);
-
+        m_mltConsumer->set("real_time", dropFrames);
         if (m_mltConsumer->start() == -1) {
             kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
         }
@@ -1769,6 +1765,19 @@ void Render::setDropFrames(bool show)
     }
 }
 
+void Render::setConsumerProperty(const QString &name, const QString &value)
+{
+    QMutexLocker locker(&m_mutex);
+    if (m_mltConsumer) {
+        m_mltConsumer->stop();
+        m_mltConsumer->set(name.toUtf8().constData(), value.toUtf8().constData());
+        if (m_isActive && m_mltConsumer->start() == -1) {
+            kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
+        }
+
+    }
+}
+
 bool Render::isPlaying() const
 {
     if (!m_mltConsumer || m_mltConsumer->is_stopped()) return false;
@@ -3857,11 +3866,11 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
                 Mlt::Properties trans_props(transition.get_properties());
                 Mlt::Transition new_transition(*m_mltProfile, transition.get("mlt_service"));
                 Mlt::Properties new_trans_props(new_transition.get_properties());
-                new_trans_props.inherit(trans_props);
-                new_transition.set_in_and_out(new_in, new_out);
+               // We cannot use MLT's property inherit because it also clones internal values like _unique_id which messes up the playlist
+               cloneProperties(new_trans_props, trans_props);
+               new_transition.set_in_and_out(new_in, new_out);
                 field->disconnect_service(transition);
                 mltPlantTransition(field, new_transition, newTransitionTrack, newTrack);
-                //field->plant_transition(new_transition, newTransitionTrack, newTrack);
             } else transition.set_in_and_out(new_in, new_out);
             break;
         }
@@ -3876,6 +3885,20 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
     return found;
 }
 
+void Render::cloneProperties(Mlt::Properties &dest, Mlt::Properties &source)
+{
+       int count = source.count();
+       int i = 0;
+       for ( i = 0; i < count; i ++ )
+       {
+               char *value = source.get(i);
+               if ( value != NULL )
+               {
+                       char *name = source.get_name( i );
+                       if (name != NULL && name[0] != '_') dest.set(name, value);
+               }
+       }
+}
 
 void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track)
 {
@@ -3897,7 +3920,8 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
             Mlt::Properties trans_props(transition.get_properties());
             Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service"));
             Mlt::Properties new_trans_props(cp->get_properties());
-            new_trans_props.inherit(trans_props);
+            //new_trans_props.inherit(trans_props);
+           cloneProperties(new_trans_props, trans_props);
             trList.append(cp);
             field->disconnect_service(transition);
         }
@@ -4399,7 +4423,8 @@ QList <TransitionInfo> Render::mltInsertTrack(int ix, bool videoTrack)
            Mlt::Properties trans_props(transition.get_properties());
            Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service"));
            Mlt::Properties new_trans_props(cp->get_properties());
-           new_trans_props.inherit(trans_props);
+           cloneProperties(new_trans_props, trans_props);
+           //new_trans_props.inherit(trans_props);
            
            if (trackChanged) {
                // Transition track needs to be adjusted