X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=c60864502164bbdfb5f92886d3aaeb46f670c3cd;hb=e3b4bf11679a3a195be8896f465b1616581f1fb3;hp=3f5cf863224c1253c687c94ddcd52728f02c0c6d;hpb=60d534a5d6d3472625430e4ffda2f654f7aec0c3;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 3f5cf863..c6086450 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -27,6 +27,7 @@ #include "kdenlivesettings.h" #include "kthumb.h" #include "definitions.h" +#include "slideshowclip.h" #include @@ -676,6 +677,11 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int if (aindex != 0) producer->set("audio_index", aindex); } + // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken although outpoint is larger + if (xml.attribute("type").toInt() == COLOR || xml.attribute("type").toInt() == TEXT + || xml.attribute("type").toInt() == IMAGE || xml.attribute("type").toInt() == SLIDESHOW) + producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1); + if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); char *tmp = decodedString(clipId); @@ -707,13 +713,31 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int Mlt::Frame *frame = producer->get_frame(); if (xml.attribute("type").toInt() == SLIDESHOW) { - if (xml.hasAttribute("ttl")) producer->set("ttl", xml.attribute("ttl").toInt()); + int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0; + if (ttl) producer->set("ttl", ttl); + if (!xml.attribute("animation").isEmpty()) { + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "affine"); + if (filter && filter->is_valid()) { + int cycle = ttl; + QString geometry = SlideshowClip::animationToGeometry(xml.attribute("animation"), cycle); + if (!geometry.isEmpty()) { + if (xml.attribute("animation").contains("low-pass")) { + Mlt::Filter *blur = new Mlt::Filter(*m_mltProfile, "boxblur"); + if (blur && blur->is_valid()) + producer->attach(*blur); + } + filter->set("transition.geometry", geometry.toUtf8().data()); + filter->set("transition.cycle", cycle); + producer->attach(*filter); + } + } + } if (xml.attribute("fade") == "1") { // user wants a fade effect to slideshow Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma"); if (filter && filter->is_valid()) { - if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1); - if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt()); + if (ttl) filter->set("cycle", ttl); + if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("duration", xml.attribute("luma_duration").toInt()); if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) { char *tmp = decodedString(xml.attribute("luma_file")); filter->set("luma.resource", tmp); @@ -723,8 +747,15 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int filter->set("luma.softness", (double) soft / 100.0); } } - Mlt::Service clipService(producer->get_service()); - clipService.attach(*filter); + producer->attach(*filter); + } + } + if (xml.attribute("crop") == "1") { + // user wants to center crop the slides + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "crop"); + if (filter && filter->is_valid()) { + filter->set("center", 1); + producer->attach(*filter); } } } @@ -1447,8 +1478,8 @@ void Render::emitFrameUpdated(Mlt::Frame& frame) int height = 0; const uchar* image = frame.get_image(format, width, height); QImage qimage(width, height, QImage::Format_ARGB32); - memcpy(qimage.bits(), image, width * height * 4); - emit frameUpdated(qimage); + memcpy(qimage.bits(), image, width * height * 4); + emit frameUpdated(qimage.rgbSwapped()); } void Render::emitFrameNumber(double position) @@ -1514,6 +1545,7 @@ void Render::showFrame(Mlt::Frame& frame) } #endif + /* * MLT playlist direct manipulation. */ @@ -1776,7 +1808,7 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr int ct = 0; Mlt::Filter *filter = sourceService.filter(ct); while (filter) { - if (filter->get("kdenlive_ix") != 0) { + if (filter->get_int("kdenlive_ix") != 0) { filtersList.append(filter); } ct++; @@ -2059,7 +2091,7 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) int ct = 0; Mlt::Filter *filter = sourceService.filter(ct); while (filter) { - if (filter->get("kdenlive_ix") != 0) { + if (filter->get_int("kdenlive_ix") != 0) { sourceService.detach(*filter); destService.attach(*filter); } else ct++; @@ -2243,8 +2275,41 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou return newLength; } +bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) +{ + Mlt::Service service(m_mltProducer->parent().get_service()); + bool success = false; + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + Mlt::Service clipService(trackPlaylist.get_service()); + + m_isBlocked = true; + mlt_service_lock(service.get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) { + if (clipService.detach(*filter) == 0) success = true; + } else if (updateIndex) { + // Adjust the other effects index + if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + ct++; + } else ct++; + filter = clipService.filter(ct); + } + m_isBlocked = false; + mlt_service_unlock(service.get_service()); + refresh(); + return success; +} + bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh) { + if (position < GenTime()) { + // Remove track effect + return mltRemoveTrackEffect(track, index, updateIndex); + } Mlt::Service service(m_mltProducer->parent().get_service()); bool success = false; Mlt::Tractor tractor(service); @@ -2269,24 +2334,36 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up // if (tag.startsWith("ladspa")) tag = "ladspa"; m_isBlocked = true; + mlt_service_lock(service.get_service()); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { + if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) { if (clipService.detach(*filter) == 0) success = true; //kDebug()<<"Deleted filter id:"<get("kdenlive_id")<<", ix:"<get("kdenlive_ix")<<", SERVICE:"<get("mlt_service"); } else if (updateIndex) { // Adjust the other effects index - if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1); + if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; } else ct++; filter = clipService.filter(ct); } m_isBlocked = false; + mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return success; } +bool Render::mltAddTrackEffect(int track, EffectsParameterList params) +{ + 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 trackService(trackProducer.get_service()); //trackPlaylist + return mltAddEffect(trackService, params, 15000, true); +} + bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh) { @@ -2304,42 +2381,49 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para } Mlt::Service clipService(clip->get_service()); - m_isBlocked = true; int duration = clip->get_playtime(); - bool updateIndex = false; if (doRefresh) { // Check if clip is visible in monitor int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); if (diff < 0 || diff > duration) doRefresh = false; } delete clip; + return mltAddEffect(clipService, params, duration, doRefresh); +} +bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int duration, bool doRefresh) +{ + bool updateIndex = false; const int filter_ix = params.paramValue("kdenlive_ix").toInt(); const QString region = params.paramValue("region"); int ct = 0; - Mlt::Filter *filter = clipService.filter(ct); + m_isBlocked = true; + mlt_service_lock(service.get_service()); + + Mlt::Filter *filter = service.filter(ct); while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() == filter_ix) { + if (filter->get_int("kdenlive_ix") == filter_ix) { // A filter at that position already existed, so we will increase all indexes later updateIndex = true; break; } ct++; - filter = clipService.filter(ct); + filter = service.filter(ct); } if (params.paramValue("id") == "speed") { // special case, speed effect is not really inserted, we just update the other effects index (kdenlive_ix) ct = 0; - filter = clipService.filter(ct); + filter = service.filter(ct); while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { - if (updateIndex) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + if (filter->get_int("kdenlive_ix") >= filter_ix) { + if (updateIndex) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); } ct++; - filter = clipService.filter(ct); + filter = service.filter(ct); } m_isBlocked = false; + mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return true; } @@ -2348,13 +2432,13 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para // temporarily remove all effects after insert point QList filtersList; ct = 0; - filter = clipService.filter(ct); + filter = service.filter(ct); while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { + if (filter->get_int("kdenlive_ix") >= filter_ix) { filtersList.append(filter); - clipService.detach(*filter); + service.detach(*filter); } else ct++; - filter = clipService.filter(ct); + filter = service.filter(ct); } // create filter @@ -2382,16 +2466,13 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para params.removeParam("max"); params.removeParam("factor"); int offset = 0; - for (int i = 0; i < keyFrames.size() - 1; ++i) { + // Special case, only one keyframe, means we want a constant value + if (keyFrames.count() == 1) { Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); if (filter && filter->is_valid()) { filter->set("kdenlive_id", filterId); - int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset; - double y1 = keyFrames.at(i).section(':', 1, 1).toDouble(); - int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt(); - double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble(); - if (x2 == -1) x2 = duration; - + int x1 = keyFrames.at(0).section(':', 0, 0).toInt(); + double y1 = keyFrames.at(0).section(':', 1, 1).toDouble(); for (int j = 0; j < params.count(); j++) { char *name = decodedString(params.at(j).name()); char *value = decodedString(params.at(j).value()); @@ -2399,16 +2480,38 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para delete[] name; delete[] value; } - filter->set("in", x1); - filter->set("out", x2); //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); - filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); - clipService.attach(*filter); - offset = 1; + service.attach(*filter); + } + } else for (int i = 0; i < keyFrames.size() - 1; ++i) { + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); + if (filter && filter->is_valid()) { + filter->set("kdenlive_id", filterId); + int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset; + double y1 = keyFrames.at(i).section(':', 1, 1).toDouble(); + int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt(); + double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble(); + if (x2 == -1) x2 = duration; + + for (int j = 0; j < params.count(); j++) { + char *name = decodedString(params.at(j).name()); + char *value = decodedString(params.at(j).value()); + filter->set(name, value); + delete[] name; + delete[] value; + } + + filter->set("in", x1); + filter->set("out", x2); + //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); + filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); + service.attach(*filter); + offset = 1; + } } - } delete[] starttag; delete[] endtag; } else { @@ -2434,6 +2537,7 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para } else { kDebug() << "filter is NULL"; m_isBlocked = false; + mlt_service_unlock(service.get_service()); return false; } params.removeParam("kdenlive_id"); @@ -2464,9 +2568,12 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para delete[] value; } + if (params.paramValue("id") == "pan_zoom") { + filter->set_in_and_out(service.get_int("in"), service.get_int("out") + 1); + } // attach filter to the clip - clipService.attach(*filter); + service.attach(*filter); } delete[] filterId; delete[] filterTag; @@ -2475,14 +2582,63 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para for (int i = 0; i < filtersList.count(); i++) { Mlt::Filter *filter = filtersList.at(i); if (updateIndex) - filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); - clipService.attach(*filter); + filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); + service.attach(*filter); } m_isBlocked = false; + mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return true; } +bool Render::mltEditTrackEffect(int track, EffectsParameterList params) +{ + 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()); + m_isBlocked = true; + int ct = 0; + QString index = params.paramValue("kdenlive_ix"); + QString tag = params.paramValue("tag"); + + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (filter->get_int("kdenlive_ix") == index.toInt()) { + break; + } + ct++; + filter = clipService.filter(ct); + } + + if (!filter) { + kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT! " << index << ", " << tag; + // filter was not found, it was probably a disabled filter, so add it to the correct place... + + bool success = false;//mltAddTrackEffect(track, params); + m_isBlocked = false; + return success; + } + QString prefix; + QString ser = filter->get("mlt_service"); + if (ser == "region") prefix = "filter0."; + mlt_service_lock(service.get_service()); + for (int j = 0; j < params.count(); j++) { + char *name = decodedString(prefix + params.at(j).name()); + char *value = decodedString(params.at(j).value()); + filter->set(name, value); + delete[] name; + delete[] value; + } + mlt_service_unlock(service.get_service()); + + m_isBlocked = false; + refresh(); + return true; + +} + bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) { QString index = params.paramValue("kdenlive_ix"); @@ -2490,11 +2646,16 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) { // This is a keyframe effect, to edit it, we remove it and re-add it. - mltRemoveEffect(track, position, index, false); - bool success = mltAddEffect(track, position, params); + bool success = mltRemoveEffect(track, position, index, false); + if (!success) kDebug() << "// ERROR Removing effect : " << index; + if (position < GenTime()) success = mltAddTrackEffect(track, params); + else success = mltAddEffect(track, position, params); + if (!success) kDebug() << "// ERROR Adding effect : " << index; return success; } - + if (position < GenTime()) { + return mltEditTrackEffect(track, params); + } // find filter Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); @@ -2530,7 +2691,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if (filter->get("kdenlive_ix") == index) { + if (filter->get_int("kdenlive_ix") == index.toInt()) { break; } ct++; @@ -2565,10 +2726,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos) { - - kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos; 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()); @@ -2592,7 +2750,7 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - int pos = QString(filter->get("kdenlive_ix")).toInt(); + int pos = filter->get_int("kdenlive_ix"); if (pos == oldPos) { filter->set("kdenlive_ix", newPos); } else ct++; @@ -2605,10 +2763,11 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) { - - kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos; + if (position < GenTime()) { + mltMoveTrackEffect(track, oldPos, newPos); + return; + } 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()); @@ -2635,19 +2794,19 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) bool found = false; if (newPos > oldPos) { while (filter) { - if (!found && QString(filter->get("kdenlive_ix")).toInt() == oldPos) { + if (!found && filter->get_int("kdenlive_ix") == oldPos) { filter->set("kdenlive_ix", newPos); filtersList.append(filter); clipService.detach(*filter); filter = clipService.filter(ct); - while (filter && QString(filter->get("kdenlive_ix")).toInt() <= newPos) { - filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1); + while (filter && filter->get_int("kdenlive_ix") <= newPos) { + filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; filter = clipService.filter(ct); } found = true; } - if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) { + if (filter && filter->get_int("kdenlive_ix") > newPos) { filtersList.append(filter); clipService.detach(*filter); } else ct++; @@ -2655,7 +2814,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) } } else { while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) { + if (filter->get_int("kdenlive_ix") == oldPos) { filter->set("kdenlive_ix", newPos); filtersList.append(filter); clipService.detach(*filter); @@ -2666,7 +2825,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) ct = 0; filter = clipService.filter(ct); while (filter) { - int pos = QString(filter->get("kdenlive_ix")).toInt(); + int pos = filter->get_int("kdenlive_ix"); if (pos >= newPos) { if (pos < oldPos) filter->set("kdenlive_ix", pos + 1); filtersList.append(filter); @@ -2684,6 +2843,70 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) if (doRefresh) refresh(); } +void Render::mltMoveTrackEffect(int track, int oldPos, int newPos) +{ + 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()); + + m_isBlocked = true; + int ct = 0; + QList filtersList; + Mlt::Filter *filter = clipService.filter(ct); + bool found = false; + if (newPos > oldPos) { + while (filter) { + if (!found && filter->get_int("kdenlive_ix") == oldPos) { + filter->set("kdenlive_ix", newPos); + filtersList.append(filter); + clipService.detach(*filter); + filter = clipService.filter(ct); + while (filter && filter->get_int("kdenlive_ix") <= newPos) { + filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + ct++; + filter = clipService.filter(ct); + } + found = true; + } + if (filter && filter->get_int("kdenlive_ix") > newPos) { + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } else { + while (filter) { + if (filter->get_int("kdenlive_ix") == oldPos) { + filter->set("kdenlive_ix", newPos); + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + + ct = 0; + filter = clipService.filter(ct); + while (filter) { + int pos = filter->get_int("kdenlive_ix"); + if (pos >= newPos) { + if (pos < oldPos) filter->set("kdenlive_ix", pos + 1); + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } + + for (int i = 0; i < filtersList.count(); i++) { + clipService.attach(*(filtersList.at(i))); + } + m_isBlocked = false; + refresh(); +} + bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) { m_isBlocked = true; @@ -2713,16 +2936,17 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); int previousStart = clip->get_in(); int newDuration = (int) clipDuration.frames(m_fps) - 1; + int currentOut = (int)(info.cropStart + info.cropDuration).frames(m_fps) - 1; int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1); - if (newDuration > clip->get_length()) { - clip->parent().set("length", newDuration + 1); - clip->parent().set("out", newDuration); - clip->set("length", newDuration + 1); + if (currentOut > clip->get_length()) { + clip->parent().set("length", currentOut + 1); + clip->parent().set("out", currentOut); + clip->set("length", currentOut + 1); } - if (newDuration > clip->get_out()) { + /*if (newDuration > clip->get_out()) { clip->parent().set_in_and_out(0, newDuration + 1); clip->set_in_and_out(0, newDuration + 1); - } + }*/ delete clip; trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart); trackPlaylist.consolidate_blanks(0);