X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=037bedc8b78865d74362bcddb7450327dd83afcf;hb=768329495eb6da87c1b73b8ef5347d04f8fb92c2;hp=e7842aabe78b81e2c7287fe290c850de6d2ee788;hpb=fb460899af4f72c9d4c328d9a6a2253e4a35b173;p=kdenlive

diff --git a/src/renderer.cpp b/src/renderer.cpp
index e7842aab..037bedc8 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -561,13 +561,16 @@ void Render::slotSplitView(bool doit)
         mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
         QString mlt_type = mlt_properties_get(properties, "mlt_type");
         QString resource = mlt_properties_get(properties, "mlt_service");
+	mlt_service nextservicetodisconnect;
 
         while (mlt_type == "transition") {
             QString added = mlt_properties_get(MLT_SERVICE_PROPERTIES(nextservice), "internal_added");
             if (added == "200") {
-                mlt_field_disconnect_service(field->get_field(), nextservice);
+		nextservicetodisconnect = nextservice;
+		nextservice = mlt_service_producer(nextservice);
+		mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
             }
-            nextservice = mlt_service_producer(nextservice);
+            else nextservice = mlt_service_producer(nextservice);
             if (nextservice == NULL) break;
             properties = MLT_SERVICE_PROPERTIES(nextservice);
             mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -1317,6 +1320,34 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone)
     xmlConsumer.start();
 }
 
+
+bool Render::saveClip(int track, GenTime position, KUrl url, QString desc)
+{
+    // find clip
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    Mlt::Producer trackProducer(tractor.track(track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+
+    int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+    Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+    if (!clip) {
+        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+        return false;
+    }
+    
+    Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData());
+    xmlConsumer.set("terminate_on_pause", 1);
+    Mlt::Playlist list;
+    list.insert_at(0, clip, 0);
+    //delete clip;
+    list.set("title", desc.toUtf8().constData());
+    xmlConsumer.connect(list);
+    xmlConsumer.run();
+    kDebug()<<"// SAVED: "<<url;
+    return true;
+}
+
 double Render::fps() const
 {
     return m_fps;
@@ -1660,6 +1691,16 @@ void Render::showFrame(Mlt::Frame& frame)
     }
 }
 
+void Render::disablePreview(bool disable)
+{
+    if (m_mltConsumer) {
+	m_mltConsumer->stop();
+	m_mltConsumer->set("preview_off", (int) disable);
+	m_mltConsumer->set("refresh", 0);
+	m_mltConsumer->start();
+    }
+}
+
 void Render::showAudio(Mlt::Frame& frame)
 {
     if (!frame.is_valid() || frame.get_int("test_audio") != 0) {
@@ -2529,7 +2570,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
 {
     bool updateIndex = false;
     const int filter_ix = params.paramValue("kdenlive_ix").toInt();
-    const QString region =  params.paramValue("region");
     int ct = 0;
     service.lock();
 
@@ -2573,15 +2613,30 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
         filter = service.filter(ct);
     }
 
-    // create filter
+    addFilterToService(service, params, duration);
+
+    // re-add following filters
+    for (int i = 0; i < filtersList.count(); i++) {
+        Mlt::Filter *filter = filtersList.at(i);
+        if (updateIndex)
+            filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
+        service.attach(*filter);
+    }
+    service.unlock();
+    if (doRefresh) refresh();
+    return true;
+}
+
+
+bool Render::addFilterToService(Mlt::Service service, EffectsParameterList params, int duration)
+{
+      // create filter
     QString tag =  params.paramValue("tag");
     //kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
     char *filterTag = qstrdup(tag.toUtf8().constData());
     char *filterId = qstrdup(params.paramValue("id").toUtf8().constData());
-    QHash<QString, QString>::Iterator it;
     QString kfr = params.paramValue("keyframes");
-
-    if (!kfr.isEmpty()) {
+  if (!kfr.isEmpty()) {
         QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts);
         //kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes");
         char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData());
@@ -2642,20 +2697,9 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
     } else {
         Mlt::Filter *filter;
         QString prefix;
-        if (!region.isEmpty()) {
-            filter = new Mlt::Filter(*m_mltProfile, "region");
-        } else filter = new Mlt::Filter(*m_mltProfile, filterTag);
+        filter = new Mlt::Filter(*m_mltProfile, filterTag);
         if (filter && filter->is_valid()) {
             filter->set("kdenlive_id", filterId);
-            if (!region.isEmpty()) {
-                filter->set("resource", region.toUtf8().constData());
-                filter->set("kdenlive_ix", params.paramValue("kdenlive_ix").toUtf8().constData());
-                filter->set("filter0", filterTag);
-                prefix = "filter0.";
-                params.removeParam("id");
-                params.removeParam("region");
-                params.removeParam("kdenlive_ix");
-            }
         } else {
             kDebug() << "filter is NULL";
             service.unlock();
@@ -2687,22 +2731,12 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
             //kDebug() << "SOX EFFECTS: " << effectArgs.simplified();
             filter->set("effect", effectArgs.simplified().toUtf8().constData());
         }
-
         // attach filter to the clip
         service.attach(*filter);
     }
+	
     delete[] filterId;
     delete[] filterTag;
-
-    // re-add following filters
-    for (int i = 0; i < filtersList.count(); i++) {
-        Mlt::Filter *filter = filtersList.at(i);
-        if (updateIndex)
-            filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
-        service.attach(*filter);
-    }
-    service.unlock();
-    if (doRefresh) refresh();
     return true;
 }
 
@@ -2744,7 +2778,6 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
 
     refresh();
     return true;
-
 }
 
 bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params)
@@ -2752,7 +2785,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     int index = params.paramValue("kdenlive_ix").toInt();
     QString tag =  params.paramValue("tag");
 
-    if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
+    if (!params.paramValue("keyframes").isEmpty() || (tag == "affine" && params.hasParam("background")) || tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
         // This is a keyframe effect, to edit it, we remove it and re-add it.
         bool success = mltRemoveEffect(track, position, index, false);
 //         if (!success) kDebug() << "// ERROR Removing effect : " << index;
@@ -2803,17 +2836,45 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         bool success = mltAddEffect(track, position, params);
         return success;
     }
-    QString prefix;
+    ct = 0;
     QString ser = filter->get("mlt_service");
-    if (ser == "region") prefix = "filter0.";
+    QList <Mlt::Filter *> filtersList;
+    service.lock();
+    if (ser != tag) {
+	// Effect service changes, delete effect and re-add it
+	clip->detach(*filter);	
+	
+	// Delete all effects after deleted one
+	filter = clip->filter(ct);
+        while (filter) {
+            if (filter->get_int("kdenlive_ix") > index) {
+                filtersList.append(filter);
+                clip->detach(*filter);
+	    }
+	    else ct++;
+            filter = clip->filter(ct);
+	}
+	
+	// re-add filter
+	addFilterToService(*clip, params, clip->get_playtime());
+	delete clip;
+	service.unlock();
+
+	if (doRefresh) refresh();
+	return true;
+    }
     if (params.hasParam("_sync_in_out")) {
         // This effect must sync in / out with parent clip
         params.removeParam("_sync_in_out");
         filter->set_in_and_out(clip->get_in(), clip->get_out());
     }
-    service.lock();
+
     for (int j = 0; j < params.count(); j++) {
-        filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
+        filter->set((params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
+    }
+    
+    for (int j = 0; j < filtersList.count(); j++) {
+	clip->attach(*(filtersList.at(j)));
     }
 
     delete clip;
@@ -2823,6 +2884,71 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     return true;
 }
 
+bool Render::mltEnableEffects(int track, GenTime position, QList <int> effectIndexes, bool disable)
+{
+    if (position < GenTime()) {
+        return mltEnableTrackEffects(track, effectIndexes, disable);
+    }
+    // find filter
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    Mlt::Producer trackProducer(tractor.track(track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+
+    int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+    Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+    if (!clip) {
+        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+        return false;
+    }
+
+    int duration = clip->get_playtime();
+    bool doRefresh = true;
+    // Check if clip is visible in monitor
+    int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
+    if (diff < 0 || diff > duration)
+        doRefresh = false;
+    int ct = 0;
+
+    Mlt::Filter *filter = clip->filter(ct);
+    while (filter) {
+        if (effectIndexes.contains(filter->get_int("kdenlive_ix"))) {
+            filter->set("disable", (int) disable);
+        }
+        ct++;
+        filter = clip->filter(ct);
+    }
+
+    delete clip;
+    service.unlock();
+
+    if (doRefresh) refresh();
+    return true;
+}
+
+bool Render::mltEnableTrackEffects(int track, QList <int> effectIndexes, bool disable)
+{
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    Mlt::Producer trackProducer(tractor.track(track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+    Mlt::Service clipService(trackPlaylist.get_service());
+    int ct = 0;
+
+    Mlt::Filter *filter = clipService.filter(ct);
+    while (filter) {
+        if (effectIndexes.contains(filter->get_int("kdenlive_ix"))) {
+            filter->set("disable", (int) disable);
+        }
+        ct++;
+        filter = clipService.filter(ct);
+    }
+    service.unlock();
+
+    refresh();
+    return true;
+}
+
 void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos)
 {
     Mlt::Service service(m_mltProducer->parent().get_service());
@@ -3311,41 +3437,59 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
     Mlt::Producer trackProducer(tractor.track(startTrack));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(moveStart);
-    //kDebug() << "//////  LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex;
+    int clipDuration = trackPlaylist.clip_length(clipIndex);
     bool checkLength = false;
     if (endTrack == startTrack) {
         Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
-        if ((!overwrite && !trackPlaylist.is_blank_at(moveEnd)) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
-            // error, destination is not empty
-            if (clipProducer) {
-                if (!trackPlaylist.is_blank_at(moveEnd) && clipProducer->is_valid()) trackPlaylist.insert_at(moveStart, clipProducer, 1);
-                delete clipProducer;
+        if (!overwrite) {
+            bool success = true;
+            if (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
+		success = false;
+	    }
+            else {
+                // Check that the destination region is empty
+                trackPlaylist.consolidate_blanks(0);
+                int destinationIndex = trackPlaylist.get_clip_index_at(moveEnd);
+                if (destinationIndex < trackPlaylist.count() - 1) {
+                    // We are not at the end of the track
+                    int blankSize = trackPlaylist.blanks_from(destinationIndex, 1);
+                    // Make sure we have enough place to insert clip
+                    if (blankSize - clipDuration - (moveEnd - trackPlaylist.clip_start(destinationIndex)) < 0) success = false;
+                }
             }
-            //int ix = trackPlaylist.get_clip_index_at(moveEnd);
-            kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
-            service.unlock();
-            return false;
-        } else {
-            trackPlaylist.consolidate_blanks(0);
-            if (overwrite) {
-                trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime());
-                int clipIndex = trackPlaylist.get_clip_index_at(moveEnd);
-                trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1);
+            if (!success) {
+                if (clipProducer) {
+                    trackPlaylist.insert_at(moveStart, clipProducer, 1);
+                    delete clipProducer;
+                }
+                kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
+                service.unlock();
+                return false;
             }
-            int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1);
-            trackPlaylist.consolidate_blanks(1);
+        }
+        
+        if (overwrite) {
+            trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime());
+            int clipIndex = trackPlaylist.get_clip_index_at(moveEnd);
+            trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1);
+        }
+        int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1);
+        if (newIndex == -1) {
+            kDebug()<<"// CANNOT MOVE CLIP TO: "<<moveEnd;
+            trackPlaylist.insert_at(moveStart, clipProducer, 1);
             delete clipProducer;
-            /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) {
-            mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt());
-            }*/
-            if (newIndex + 1 == trackPlaylist.count()) checkLength = true;
+            service.unlock();
+            return false;
         }
-        //service.unlock();
+        trackPlaylist.consolidate_blanks(1);
+        delete clipProducer;
+        if (newIndex + 1 == trackPlaylist.count()) checkLength = true;
     } else {
         Mlt::Producer destTrackProducer(tractor.track(endTrack));
         Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service());
         if (!overwrite && !destTrackPlaylist.is_blank_at(moveEnd)) {
             // error, destination is not empty
+            kDebug() << "Cannot move: Destination is not empty";
             service.unlock();
             return false;
         } else {
@@ -3467,6 +3611,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
 
     while (mlt_type == "transition") {
         Mlt::Transition transition((mlt_transition) nextservice);
+	nextservice = mlt_service_producer(nextservice);
         int currentTrack = transition.get_b_track();
         int currentIn = (int) transition.get_in();
         int currentOut = (int) transition.get_out();
@@ -3485,7 +3630,6 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
             } else transition.set_in_and_out(new_in, new_out);
             break;
         }
-        nextservice = mlt_service_producer(nextservice);
         if (nextservice == NULL) break;
         properties = MLT_SERVICE_PROPERTIES(nextservice);
         mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -3505,12 +3649,16 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
     QString mlt_type = mlt_properties_get(properties, "mlt_type");
     QString resource = mlt_properties_get(properties, "mlt_service");
     QList <Mlt::Transition *> trList;
+    mlt_properties insertproperties = tr.get_properties();
+    QString insertresource = mlt_properties_get(insertproperties, "mlt_service");
+    bool isMixTransition = insertresource == "mix";
 
     while (mlt_type == "transition") {
         Mlt::Transition transition((mlt_transition) nextservice);
+	nextservice = mlt_service_producer(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))) {
+        if ((isMixTransition || resource != "mix") && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) {
             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());
@@ -3520,7 +3668,6 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
         }
         //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");
@@ -3533,6 +3680,7 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
         //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());
     }
+    qDeleteAll(trList);
 }
 
 void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool force)
@@ -3836,29 +3984,29 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
     Mlt::Tractor tractor(service);
     Mlt::Field *field = tractor.field();
 
-    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, tag.toUtf8().constData());
+    Mlt::Transition transition(*m_mltProfile, tag.toUtf8().constData());
     if (out != GenTime())
-        transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1);
+        transition.set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1);
 
     if (do_refresh && (m_mltProducer->position() < in.frames(m_fps) || m_mltProducer->position() > out.frames(m_fps))) do_refresh = false;
     QMap<QString, QString>::Iterator it;
     QString key;
-    if (xml.attribute("automatic") == "1") transition->set("automatic", 1);
+    if (xml.attribute("automatic") == "1") transition.set("automatic", 1);
     //kDebug() << " ------  ADDING TRANSITION PARAMs: " << args.count();
     if (xml.hasAttribute("id"))
-        transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData());
+        transition.set("kdenlive_id", xml.attribute("id").toUtf8().constData());
     if (xml.hasAttribute("force_track"))
-        transition->set("force_track", xml.attribute("force_track").toInt());
+        transition.set("force_track", xml.attribute("force_track").toInt());
 
     for (it = args.begin(); it != args.end(); ++it) {
         key = it.key();
         if (!it.value().isEmpty())
-            transition->set(key.toUtf8().constData(), it.value().toUtf8().constData());
+            transition.set(key.toUtf8().constData(), it.value().toUtf8().constData());
         //kDebug() << " ------  ADDING TRANS PARAM: " << key << ": " << it.value();
     }
     // attach transition
     service.lock();
-    mltPlantTransition(field, *transition, a_track, b_track);
+    mltPlantTransition(field, transition, a_track, b_track);
     // field->plant_transition(*transition, a_track, b_track);
     service.unlock();
     if (do_refresh) refresh();
@@ -3945,19 +4093,17 @@ void Render::fillSlowMotionProducers()
     }
 }
 
-void Render::mltInsertTrack(int ix, bool videoTrack)
+QList <TransitionInfo> Render::mltInsertTrack(int ix, bool videoTrack)
 {
-    blockSignals(true);
-
     Mlt::Service service(m_mltProducer->parent().get_service());
-    service.lock();
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
-        return;
+        return QList <TransitionInfo> ();
     }
-
+    blockSignals(true);
+    service.lock();
     Mlt::Tractor tractor(service);
-
+    QList <TransitionInfo> transitionInfos;
     Mlt::Playlist playlist;
     int ct = tractor.count();
     if (ix > ct) {
@@ -3990,20 +4136,51 @@ void Render::mltInsertTrack(int ix, bool videoTrack)
     mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
     QString mlt_type = mlt_properties_get(properties, "mlt_type");
     QString resource = mlt_properties_get(properties, "mlt_service");
+    Mlt::Field *field = tractor.field();
+    QList <Mlt::Transition *> trList;
 
     while (mlt_type == "transition") {
         if (resource != "mix") {
-            mlt_transition tr = (mlt_transition) nextservice;
-            int currentTrack = mlt_transition_get_b_track(tr);
-            int currentaTrack = mlt_transition_get_a_track(tr);
-            mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
-
-            if (currentTrack >= ix) {
-                mlt_properties_set_int(properties, "b_track", currentTrack + 1);
-                mlt_properties_set_int(properties, "a_track", currentaTrack + 1);
-            }
+	    Mlt::Transition transition((mlt_transition) nextservice);
+	    nextservice = mlt_service_producer(nextservice);
+            int currentbTrack = transition.get_b_track();
+            int currentaTrack = transition.get_a_track();
+	    bool trackChanged = false;
+	    bool forceTransitionTrack = false;
+            if (currentbTrack >= ix) {
+		if (currentbTrack == ix && currentaTrack < ix) forceTransitionTrack = true;
+		currentbTrack++;
+		trackChanged = true;
+	    }
+	    if (currentaTrack >= ix) {
+		currentaTrack++;
+		trackChanged = true;
+	    }
+	    kDebug()<<"// Newtrans: "<<currentaTrack<<"/"<<currentbTrack;
+	    
+	    // disconnect all transitions
+	    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);
+	    
+	    if (trackChanged) {
+		// Transition track needs to be adjusted
+		cp->set("a_track", currentaTrack);
+		cp->set("b_track", currentbTrack);
+		// Check if transition track was changed and needs to be forced
+		if (forceTransitionTrack) cp->set("force_track", 1);
+		TransitionInfo trInfo;
+		trInfo.startPos = GenTime(transition.get_in(), m_fps);
+		trInfo.a_track = currentaTrack;
+		trInfo.b_track = currentbTrack;
+		trInfo.forceTrack = cp->get_int("force_track");
+		transitionInfos.append(trInfo);
+	    }
+	    trList.append(cp);
+	    field->disconnect_service(transition);
         }
-        nextservice = mlt_service_producer(nextservice);
+        else nextservice = mlt_service_producer(nextservice);
         if (nextservice == NULL) break;
         properties = MLT_SERVICE_PROPERTIES(nextservice);
         mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -4011,19 +4188,23 @@ void Render::mltInsertTrack(int ix, bool videoTrack)
     }
 
     // Add audio mix transition to last track
-    Mlt::Field *field = tractor.field();
-    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
-    transition->set("a_track", 1);
-    transition->set("b_track", ct);
-    transition->set("always_active", 1);
-    transition->set("internal_added", 237);
-    transition->set("combine", 1);
-    field->plant_transition(*transition, 1, ct);
-    //mlt_service_unlock(m_mltConsumer->get_service());
+    Mlt::Transition transition(*m_mltProfile, "mix");
+    transition.set("a_track", 1);
+    transition.set("b_track", ct);
+    transition.set("always_active", 1);
+    transition.set("internal_added", 237);
+    transition.set("combine", 1);
+    mltPlantTransition(field, transition, 1, ct);
+    
+    // re-add transitions
+    for (int i = trList.count() - 1; i >= 0; i--) {
+        field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
+    }
+    qDeleteAll(trList);
+    
     service.unlock();
-    //tractor.multitrack()->refresh();
-    //tractor.refresh();
     blockSignals(false);
+    return transitionInfos;
 }
 
 
@@ -4213,5 +4394,48 @@ const QString Render::activeClipId()
     return QString();
 }
 
+//static 
+bool Render::getBlackMagicDeviceList(KComboBox *devicelist)
+{
+    Mlt::Profile profile;
+    Mlt::Producer bm(profile, "decklink");
+    int found_devices = 0;
+    if (bm.is_valid()) {
+	bm.set("list_devices", 1);
+	found_devices = bm.get_int("devices");
+    }
+    if (found_devices <= 0) {
+	devicelist->setEnabled(false);
+	return false;
+    }
+    for (int i = 0; i < found_devices; i++) {
+	char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData());
+	devicelist->addItem(bm.get(tmp));
+	delete[] tmp;
+    }
+    return true;
+}
+
+bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist)
+{
+    Mlt::Profile profile;
+    Mlt::Consumer bm(profile, "decklink");
+    int found_devices = 0;
+    if (bm.is_valid()) {
+	bm.set("list_devices", 1);
+	found_devices = bm.get_int("devices");
+    }
+    if (found_devices <= 0) {
+	devicelist->setEnabled(false);
+	return false;
+    }
+    for (int i = 0; i < found_devices; i++) {
+	char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData());
+	devicelist->addItem(bm.get(tmp));
+	delete[] tmp;
+    }
+    return true;
+}
+
 #include "renderer.moc"