#include "kdenlivesettings.h"
#include "kthumb.h"
#include "definitions.h"
+#include "slideshowclip.h"
#include <mlt++/Mlt.h>
#endif
self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
+ if (frame_ptr->convert_image)
+ self->emitFrameUpdated(frame);
if (frame.get_double("_speed") == 0.0) {
self->emitConsumerStopped();
} else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
resource = mlt_properties_get(properties, "mlt_service");
}
- int trackNb = tractor.count();
- while (trackNb > 0) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
- trackNb--;
}
}
mlt_service_unlock(service.get_service());
delete[] tmp;
}
+ int volume = KdenliveSettings::volume();
+ m_mltConsumer->set("volume", (float)volume / 100);
m_mltConsumer->set("progressive", 1);
m_mltConsumer->set("audio_buffer", 1024);
QString videoDriver = KdenliveSettings::videodrivername();
QString currentDriver = m_mltConsumer->get("video_driver");
if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
- if (m_activeProfile == profileName && currentDriver == videoDriver) {
+ QString background = KdenliveSettings::window_background().name();
+ QString currentBackground = m_mltConsumer->get("window_background");
+ int volume = KdenliveSettings::volume();
+ int currentVolume = (int)(QString(m_mltConsumer->get("volume")).toDouble() * 100.0);
+ if (m_activeProfile == profileName && currentDriver == videoDriver && volume == currentVolume && background == currentBackground) {
kDebug() << "reset to same profile, nothing to do";
return 1;
}
Mlt::Service service(m_mltProducer->get_service());
if (service.type() == tractor_type) {
Mlt::Tractor tractor(service);
- int trackNb = tractor.count();
- while (trackNb > 0) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
trackPlaylist.clear();
- trackNb--;
}
}
return 1;
}
-/** Wraps the VEML command of the same name; Seeks the renderer clip to the given time. */
void Render::seek(GenTime time)
{
if (!m_mltProducer)
if (service.type() != tractor_type || tractor.count() < 2) return;
Mlt::Field *field = tractor.field();
if (doit) {
- int screen = 0;
- for (int i = 1; i < tractor.count() && screen < 4; i++) {
+ for (int i = 1, screen = 0; i < tractor.count() && screen < 4; i++) {
Mlt::Producer trackProducer(tractor.track(i));
kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide");
if (QString(trackProducer.get("hide")).toInt() != 1) {
producer = new Mlt::Producer(*m_mltProfile, 0, tmp);
delete[] tmp;
if (producer && xml.hasAttribute("xmldata")) {
- char *tmp = decodedString(xml.attribute("xmldata"));
+ tmp = decodedString(xml.attribute("xmldata"));
producer->set("xmldata", tmp);
delete[] tmp;
}
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);
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);
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);
}
}
}
int frame_height = imageHeight;
uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
- QPixmap pix(frame_width, frame_height);
+ QPixmap pix;
if (!image.isNull()) {
- pix = QPixmap::fromImage(image.rgbSwapped());
+ if (frame_width > (2 * width)) {
+ // there was a scaling problem, do it manually
+ QImage scaled = image.scaled(width, imageHeight);
+ pix = QPixmap::fromImage(scaled.rgbSwapped());
+ } else pix = QPixmap::fromImage(image.rgbSwapped());
} else
pix.fill(Qt::black);
metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
producer->seek(0);
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
kDebug() << "REquested fuile info for: " << url.path();
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
// FIXME: should delete this to avoid a leak...
//delete producer;
}
-/** Create the producer from the MLT XML QDomDocument */
#if 0
+/** Create the producer from the MLT XML QDomDocument */
void Render::initSceneList()
{
kDebug() << "-------- INIT SCENE LIST ------_";
}
#endif
-
-
-/** Create the producer from the MLT XML QDomDocument */
int Render::setProducer(Mlt::Producer *producer, int position)
{
if (m_winid == -1) return -1;
if (position != -1) {
m_mltProducer->seek(position);
emit rendererPosition(position);
- }
+ } else emit rendererPosition((int) m_mltProducer->position());
m_isBlocked = false;
return error;
}
-
-
-/** Create the producer from the MLT XML QDomDocument */
int Render::setSceneList(QDomDocument list, int position)
{
return setSceneList(list.toString(), position);
}
-/** Create the producer from the MLT XML QDomDocument */
int Render::setSceneList(QString playlist, int position)
{
if (m_winid == -1) return -1;
resource = mlt_properties_get(properties, "mlt_service");
}
- int trackNb = tractor.count();
- while (trackNb > 0) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
- trackNb--;
}
delete field;
}
//if (position != 0) emit rendererPosition(position);
}
-/** Create the producer from the MLT XML QDomDocument */
const QString Render::sceneList()
{
QString playlist;
return true;
}
-
void Render::saveZone(KUrl url, QString desc, QPoint zone)
{
kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name;
return m_name;
}
+void Render::emitFrameUpdated(Mlt::Frame& frame)
+{
+ mlt_image_format format = mlt_image_rgb24a;
+ int width = 0;
+ 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.rgbSwapped());
+}
void Render::emitFrameNumber(double position)
{
m_framePosition = position;
emit rendererPosition((int) position);
- //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId));
}
void Render::emitConsumerStopped()
}
}
-
-
void Render::exportFileToFirewire(QString /*srcFileName*/, int /*port*/, GenTime /*startTime*/, GenTime /*endTime*/)
{
KMessageBox::sorry(0, i18n("Firewire is not enabled on your system.\n Please install Libiec61883 and recompile Kdenlive"));
}
-
void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
{
if (!m_mltProducer) {
}
#endif
-/** MLT PLAYLIST DIRECT MANIPULATON **/
+/*
+ * MLT playlist direct manipulation.
+ */
void Render::mltCheckLength(Mlt::Tractor *tractor)
{
}
}
+Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element)
+{
+ if (element.attribute("speed", "1.0").toDouble() == 1.0 && element.attribute("strobe", "1").toInt() == 1) return prod;
+
+ // We want a slowmotion producer
+ double speed = element.attribute("speed", "1.0").toDouble();
+ int strobe = element.attribute("strobe", "1").toInt();
+ QString url = QString::fromUtf8(prod->get("resource"));
+ url.append('?' + QString::number(speed));
+ if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
+ Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
+ if (!slowprod || slowprod->get_producer() == NULL) {
+ char *tmp = decodedString(url);
+ slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
+ if (strobe > 1) slowprod->set("strobe", strobe);
+ delete[] tmp;
+ QString id = prod->get("id");
+ if (id.contains('_')) id = id.section('_', 0, 0);
+ QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
+ if (strobe > 1) producerid.append(':' + QString::number(strobe));
+ tmp = decodedString(producerid);
+ slowprod->set("id", tmp);
+ delete[] tmp;
+ m_slowmotionProducers.insert(url, slowprod);
+ }
+ return slowprod;
+}
+
int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite, bool push)
{
if (m_mltProducer == NULL) {
int trackDuration = trackProducer.get_playtime() - 1;
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
//kDebug()<<"/// INSERT cLIP: "<<info.cropStart.frames(m_fps)<<", "<<info.startPos.frames(m_fps)<<"-"<<info.endPos.frames(m_fps);
-
- if (element.attribute("speed", "1.0").toDouble() != 1.0 || element.attribute("strobe", "1").toInt() > 1) {
- // We want a slowmotion producer
- double speed = element.attribute("speed", "1.0").toDouble();
- int strobe = element.attribute("strobe", "1").toInt();
- QString url = QString::fromUtf8(prod->get("resource"));
- url.append('?' + QString::number(speed));
- if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
- Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
- if (!slowprod || slowprod->get_producer() == NULL) {
- char *tmp = decodedString(url);
- slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
- if (strobe > 1) slowprod->set("strobe", strobe);
- delete[] tmp;
- QString id = prod->get("id");
- if (id.contains('_')) id = id.section('_', 0, 0);
- QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
- if (strobe > 1) producerid.append(':' + QString::number(strobe));
- tmp = decodedString(producerid);
- slowprod->set("id", tmp);
- delete[] tmp;
- m_slowmotionProducers.insert(url, slowprod);
- }
- prod = slowprod;
- if (prod == NULL || !prod->is_valid()) {
- mlt_service_unlock(service.get_service());
- return -1;
- }
+ prod = checkSlowMotionProducer(prod, element);
+ if (prod == NULL || !prod->is_valid()) {
+ mlt_service_unlock(service.get_service());
+ return -1;
}
+
int cutPos = (int) info.cropStart.frames(m_fps);
if (cutPos < 0) cutPos = 0;
int insertPos = (int) info.startPos.frames(m_fps);
void Render::mltCutClip(int track, GenTime position)
{
-
m_isBlocked = true;
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int startPos = info.startPos.frames(m_fps);
int clipIndex = trackPlaylist.get_clip_index_at(startPos);
+ if (trackPlaylist.is_blank(clipIndex)) {
+ kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << startPos;
+ return false;
+ }
+ mlt_service_lock(service.get_service());
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
-
// keep effects
QList <Mlt::Filter *> filtersList;
Mlt::Service sourceService(clip->get_service());
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++;
filter = sourceService.filter(ct);
}
- if (!mltRemoveClip(info.track, info.startPos)) return false;
- if (mltInsertClip(info, element, prod) == -1) return false;
+
+ trackPlaylist.replace_with_blank(clipIndex);
+ delete clip;
+ //if (!mltRemoveClip(info.track, info.startPos)) return false;
+ prod = checkSlowMotionProducer(prod, element);
+ if (prod == NULL || !prod->is_valid()) {
+ mlt_service_unlock(service.get_service());
+ return false;
+ }
+ Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps));
+ trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1);
+ delete clip2;
+
+
+ //if (mltInsertClip(info, element, prod) == -1) return false;
if (!filtersList.isEmpty()) {
clipIndex = trackPlaylist.get_clip_index_at(startPos);
Mlt::Producer *destclip = trackPlaylist.get_clip(clipIndex);
for (int i = 0; i < filtersList.count(); i++)
destService.attach(*(filtersList.at(i)));
}
+ mlt_service_unlock(service.get_service());
return true;
}
resource = mlt_properties_get(properties, "mlt_service");
}
} else {
- int trackNb = tractor.count();
- while (trackNb > 1) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 1; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
-
//int clipNb = trackPlaylist.count();
- insertPos = trackClipStartList.value(trackNb - 1);
+ insertPos = trackClipStartList.value(trackNb);
if (insertPos != -1) {
insertPos += offset;
}
trackPlaylist.consolidate_blanks(0);
}
- trackNb--;
}
// now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
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++;
QString serv = clipparent.get("mlt_service");
QString id = clipparent.get("id");
+ if (speed <= 0 && speed > -1) speed = 1.0;
//kDebug() << "CLIP SERVICE: " << serv;
if (serv == "avformat" && (speed != 1.0 || strobe > 1)) {
mlt_service_lock(service.get_service());
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);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+
+ int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
if (!clip) {
kDebug() << " / / / CANNOT FIND CLIP TO REMOVE EFFECT";
- return success;
+ return false;
}
+
Mlt::Service clipService(clip->get_service());
+ int duration = clip->get_playtime();
+ 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;
+
// 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:"<<filter->get("kdenlive_id")<<", ix:"<<filter->get("kdenlive_ix")<<", SERVICE:"<<filter->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)
{
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+ int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
if (!clip) {
return false;
}
+
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;
}
// temporarily remove all effects after insert point
QList <Mlt::Filter *> 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
QString tag = params.paramValue("tag");
- kDebug() << " / / INSERTING EFFECT: " << tag;
+ kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
if (tag.startsWith("ladspa")) tag = "ladspa";
char *filterTag = decodedString(tag);
char *filterId = decodedString(params.paramValue("id"));
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());
delete[] name;
delete[] value;
}
-
filter->set("in", x1);
- filter->set("out", x2);
//kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
filter->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<<" / "<<max<<", "<<y1<<", factor: "<<factor;
+ filter->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 {
- Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
- if (filter && filter->is_valid())
+ Mlt::Filter *filter;
+ QString prefix;
+ if (!region.isEmpty()) {
+ filter = new Mlt::Filter(*m_mltProfile, "region");
+ } else filter = new Mlt::Filter(*m_mltProfile, filterTag);
+ if (filter && filter->is_valid()) {
filter->set("kdenlive_id", filterId);
- else {
+ if (!region.isEmpty()) {
+ char *tmp = decodedString(region);
+ filter->set("resource", tmp);
+ tmp = decodedString(params.paramValue("kdenlive_ix"));
+ filter->set("kdenlive_ix", tmp);
+ filter->set("filter0", filterTag);
+ prefix = "filter0.";
+ delete[] tmp;
+ params.removeParam("id");
+ params.removeParam("region");
+ params.removeParam("kdenlive_ix");
+ }
+ } else {
kDebug() << "filter is NULL";
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
return false;
}
-
params.removeParam("kdenlive_id");
for (int j = 0; j < params.count(); j++) {
- char *name = decodedString(params.at(j).name());
+ char *name = decodedString(prefix + params.at(j).name());
char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
params.removeParam("kdenlive_ix");
params.removeParam("tag");
params.removeParam("disable");
+ params.removeParam("region");
for (int j = 0; j < params.count(); j++) {
effectArgs.append(' ' + params.at(j).value());
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;
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");
QString tag = params.paramValue("tag");
- if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
+ 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);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+
+ 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::Service clipService(clip->get_service());
+ 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;
delete clip;
m_isBlocked = true;
int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
-
- /*
- kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
+ /* kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
while (filter) {
kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->get("kdenlive_ix");
filter = clipService.filter(ct);
}
kDebug() << "++++++++++++++++++++++++++";
- */
ct = 0;
- filter = clipService.filter(ct);
+ filter = clipService.filter(ct); */
+
+ Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (filter->get("kdenlive_ix") == index) {
+ if (filter->get_int("kdenlive_ix") == index.toInt()) {
break;
}
ct++;
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(params.at(j).name());
+ char *name = decodedString(prefix + params.at(j).name());
char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
mlt_service_unlock(service.get_service());
m_isBlocked = false;
- refresh();
+ if (doRefresh) refresh();
return true;
}
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());
- //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+
+ 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;
}
+
Mlt::Service clipService(clip->get_service());
+ 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;
delete clip;
+
m_isBlocked = true;
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++;
}
m_isBlocked = false;
- refresh();
+ if (doRefresh) refresh();
}
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());
- //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+
+ 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;
}
+
Mlt::Service clipService(clip->get_service());
+ 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;
delete clip;
+
m_isBlocked = true;
int ct = 0;
QList <Mlt::Filter *> filtersList;
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++;
}
} 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);
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);
clipService.attach(*(filtersList.at(i)));
}
+ m_isBlocked = false;
+ 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 <Mlt::Filter *> 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();
}
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);
return false;
}
int previousStart = clip->get_in();
+ int previousOut = clip->get_out();
delete clip;
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
m_isBlocked = true;
- trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset);
+ trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousOut + frameOffset);
m_isBlocked = false;
mlt_service_unlock(service.get_service());
m_mltConsumer->set("refresh", 1);
}
mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
- if (trackPlaylist.is_blank(clipIndex)) {
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+ if (clip == NULL || clip->is_blank()) {
kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!";
mlt_service_unlock(service.get_service());
return false;
}
- int previousStart = trackPlaylist.clip_start(clipIndex);
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
+ int previousStart = clip->get_in();
+ int previousOut = clip->get_out();
+ delete clip;
m_isBlocked = true;
- kDebug() << "RESIZE, old start: " << previousStart + moveFrame << ", " << previousStart + previousDuration;
- trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration);
+ previousStart += moveFrame;
+ if (previousStart < 0) {
+ // special case, in point becoming negative (resizing images)
+ previousOut -= previousStart;
+ previousStart = 0;
+ }
+ // kDebug() << "RESIZE, new start: " << previousStart << ", " << previousOut;
+ trackPlaylist.resize_clip(clipIndex, previousStart, previousOut);
if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
else {
//int midpos = info.startPos.frames(m_fps) + moveFrame - 1;
int blankIndex = clipIndex - 1;
int blankLength = trackPlaylist.clip_length(blankIndex);
- kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame;
+ // kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame;
if (! trackPlaylist.is_blank(blankIndex)) {
kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK";
}
kWarning() << "// TRACTOR PROBLEM";
return false;
}
- mlt_service_lock(m_mltConsumer->get_service());
-
+ mlt_service_lock(service.get_service());
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (clipProducer == NULL || clipProducer->is_blank()) {
kDebug() << "// ERROR UPDATING CLIP PROD";
delete clipProducer;
- mlt_service_unlock(m_mltConsumer->get_service());
+ mlt_service_unlock(service.get_service());
m_isBlocked--;
return false;
}
Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out());
- if (!clip) return false;
+ if (!clip || !clip->is_valid()) {
+ if (clip) delete clip;
+ delete clipProducer;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
+ return false;
+ }
// move all effects to the correct producer
mltPasteEffects(clipProducer, clip);
trackPlaylist.insert_at(pos, clip, 1);
delete clip;
delete clipProducer;
- mlt_service_unlock(m_mltConsumer->get_service());
+ mlt_service_unlock(service.get_service());
m_isBlocked--;
return true;
}
bool checkLength = false;
if (endTrack == startTrack) {
Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
- if (!overwrite && (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || clipProducer->is_blank())) {
+ if ((!overwrite && !trackPlaylist.is_blank_at(moveEnd)) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
// error, destination is not empty
- if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1);
- if (clipProducer) delete clipProducer;
+ if (clipProducer) {
+ if (!trackPlaylist.is_blank_at(moveEnd) && clipProducer->is_valid()) trackPlaylist.insert_at(moveStart, clipProducer, 1);
+ delete clipProducer;
+ }
//int ix = trackPlaylist.get_clip_index_at(moveEnd);
kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
mlt_service_unlock(service.get_service());
int new_in = (int)newIn.frames(m_fps);
int new_out = (int)newOut.frames(m_fps) - 1;
if (new_in >= new_out) return false;
+ int old_in = (int)oldIn.frames(m_fps);
+ int old_out = (int)oldOut.frames(m_fps) - 1;
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
+ bool doRefresh = true;
+ // Check if clip is visible in monitor
+ int diff = old_out - m_mltProducer->position();
+ if (diff < 0 || diff > old_out - old_in) doRefresh = false;
+ if (doRefresh) {
+ diff = new_out - m_mltProducer->position();
+ if (diff < 0 || diff > new_out - new_in) doRefresh = false;
+ }
+
m_isBlocked++;
mlt_service_lock(service.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");
- int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2;
+ int old_pos = (int)(old_in + old_out) / 2;
bool found = false;
while (mlt_type == "transition") {
}
mlt_service_unlock(service.get_service());
m_isBlocked--;
- refresh();
+ if (doRefresh) refresh();
//if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
return found;
}
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
mltAddTransition(tag, a_track, b_track, in, out, xml, false);
}
- refresh();
- //mltSavePlaylist();
+
+ if (m_mltProducer->position() > in.frames(m_fps) && m_mltProducer->position() < out.frames(m_fps)) refresh();
}
void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
QMap<QString, QString>::Iterator it;
QString key;
mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr);
+
+ QString currentId = mlt_properties_get(transproperties, "kdenlive_id");
+ if (currentId != xml.attribute("id")) {
+ // The transition ID is not the same, so reset all properties
+ char *tmp = decodedString(xml.attribute("id"));
+ mlt_properties_set(transproperties, "kdenlive_id", tmp);
+ delete[] tmp;
+ // Cleanup previous properties
+ QStringList permanentProps;
+ permanentProps << "factory" << "kdenlive_id" << "mlt_service" << "mlt_type" << "in";
+ permanentProps << "out" << "a_track" << "b_track";
+ for (int i = 0; i < mlt_properties_count(transproperties); i++) {
+ QString propName = mlt_properties_get_name(transproperties, i);
+ if (!propName.startsWith('_') && ! permanentProps.contains(propName)) {
+ tmp = decodedString(propName);
+ mlt_properties_set(transproperties, tmp, "");
+ delete[] tmp;
+ }
+ }
+ }
+
mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").toInt());
mlt_properties_set_int(transproperties, "automatic", xml.attribute("automatic", "0").toInt());
- // update the transition id in case it uses the same MLT service but different Kdenlive id
- char *tmp = decodedString(xml.attribute("id"));
- mlt_properties_set(transproperties, "kdenlive_id", tmp);
- delete[] tmp;
+
if (currentBTrack != a_track) {
- mlt_properties_set_int(properties, "a_track", a_track);
+ mlt_properties_set_int(transproperties, "a_track", a_track);
}
for (it = map.begin(); it != map.end(); ++it) {
key = it.key();
Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId);
if (out != GenTime())
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);
projects / kdenlive / blobdiff