Fix audio thumbs not displayed on project opening and abortion if audio thumbs creation

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 9ea419bea59beb4f2b70025116ab31bc2e6fc088..fbee984951ac5aa2e2084d85893610666416b490 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1630,6 +1630,7 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro
         }
     }
     int cutPos = (int) info.cropStart.frames(m_fps);
+    if (cutPos < 0) cutPos = 0;
     int insertPos = (int) info.startPos.frames(m_fps);
     int cutDuration = (int)(info.endPos - info.startPos).frames(m_fps) - 1;
     Mlt::Producer *clip = prod->cut(cutPos, cutDuration + cutPos);
@@ -2750,17 +2751,15 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
     }
     mlt_service_lock(service.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
-    Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
-    if (clip == NULL) {
+    if (trackPlaylist.is_blank(clipIndex)) {
         kDebug() << "////////  ERROR RSIZING NULL CLIP!!!!!!!!!!!";
         mlt_service_unlock(service.get_service());
         return false;
     }
-    int previousStart = clip->get_in();
-    delete clip;
+    int previousStart = trackPlaylist.clip_start(clipIndex);
     int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
     m_isBlocked = true;
-    kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
+    kDebug() << "RESIZE, old start: " << previousStart + moveFrame << ", " << previousStart + previousDuration;
     trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration);
     if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
     else {
@@ -3016,7 +3015,8 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
                 new_trans_props.inherit(trans_props);
                 new_transition.set_in_and_out(new_in, new_out);
                 field->disconnect_service(transition);
-                field->plant_transition(new_transition, newTransitionTrack, newTrack);
+                mltPlantTransition(field, new_transition, newTransitionTrack, newTrack);
+                //field->plant_transition(new_transition, newTransitionTrack, newTrack);
             } else transition.set_in_and_out(new_in, new_out);
             break;
         }
@@ -3033,9 +3033,50 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
     return found;
 }
 
-void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
+
+void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track)
 {
-    if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
+    mlt_service nextservice = mlt_service_get_producer(field->get_service());
+    mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+    QString mlt_type = mlt_properties_get(properties, "mlt_type");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+    QList <Mlt::Transition *> trList;
+
+    while (mlt_type == "transition") {
+        Mlt::Transition transition((mlt_transition) nextservice);
+        int aTrack = transition.get_a_track();
+        int bTrack = transition.get_b_track();
+        if (resource != "mix" && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) {
+            Mlt::Properties trans_props(transition.get_properties());
+            char *tmp = decodedString(transition.get("mlt_service"));
+            Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, tmp);
+            delete[] tmp;
+            Mlt::Properties new_trans_props(cp->get_properties());
+            new_trans_props.inherit(trans_props);
+            trList.append(cp);
+            field->disconnect_service(transition);
+        }
+        //else kDebug() << "// FOUND TRANS OK, "<<resource<< ", A_: " << aTrack << ", B_ "<<bTrack;
+
+        nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
+    }
+
+    field->plant_transition(tr, a_track, b_track);
+
+    // re-add upper transitions
+    for (int i = 0; i < trList.count(); i++) {
+        // kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
+        field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
+    }
+}
+
+void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool force)
+{
+    if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
     else {
         mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
         mltAddTransition(tag, a_track, b_track, in, out, xml, false);
@@ -3352,8 +3393,9 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
         delete[] name;
         delete[] value;
     }
-    // attach filter to the clip
-    field->plant_transition(*transition, a_track, b_track);
+    // attach transition
+    mltPlantTransition(field, *transition, a_track, b_track);
+    // field->plant_transition(*transition, a_track, b_track);
     delete[] transId;
     if (do_refresh) refresh();
     return true;
@@ -3545,13 +3587,13 @@ void Render::mltDeleteTrack(int ix)
             int a_track = mappedProps.value("a_track").toInt();
             int b_track = mappedProps.value("b_track").toInt();
             if (a_track > 0 && a_track >= ix) a_track --;
-            if (b_track > 0 && b_track > ix) b_track --;
             if (b_track == ix) {
                 // transition was on the deleted track, so remove it
                 tractor.removeChild(transitions.at(i));
                 i--;
                 continue;
             }
+            if (b_track > 0 && b_track > ix) b_track --;
             for (int j = 0; j < props.count(); j++) {
                 QDomElement f = props.at(j).toElement();
                 if (f.attribute("name") == "a_track") f.firstChild().setNodeValue(QString::number(a_track));