* Cleanup transode stabilize GUI: http://kdenlive.org/mantis/view.php?id=2930

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 15673b70086f6e5a0ea35fee0a47fa41dd5c5a3d..431a5d5133d6b11adc212d7ec7863b7dcc31b701 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1062,10 +1062,10 @@ void Render::processFileProperties()
                snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", vindex);
                if (producer->get(property)) {
                    filePropertyMap["videocodec"] = producer->get(property);
-               } else {
-                   snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex);
-                   if (producer->get(property))
-                       filePropertyMap["videocodec"] = producer->get(property);
+               }
+               snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex);
+               if (producer->get(property)) {
+                   filePropertyMap["videocodecid"] = producer->get(property);
                }
                QString query;
                query = QString("meta.media.%1.codec.pix_fmt").arg(vindex);
@@ -2251,12 +2251,13 @@ bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement ele
 bool Render::mltRemoveClip(int track, GenTime position)
 {
     m_refreshTimer.stop();
+    
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
         return false;
     }
-    //service.lock();
+    service.lock();
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
@@ -2264,7 +2265,7 @@ bool Render::mltRemoveClip(int track, GenTime position)
 
     if (trackPlaylist.is_blank(clipIndex)) {
         kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(m_fps);
-        //service.unlock();
+        service.unlock();
         return false;
     }
     Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
@@ -2280,7 +2281,7 @@ bool Render::mltRemoveClip(int track, GenTime position)
     if (trackPlaylist.is_blank(i)) blk = "(blank)";
     kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
     }*/
-    //service.unlock();
+    service.unlock();
     if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength(&tractor);
     return true;
 }