#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)
+ if (self->sendFrameForAnalysis && 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) {
Render::Render(const QString & rendererName, int winid, int /* extid */, QString profile, QWidget *parent) :
QObject(parent),
m_isBlocked(0),
+ sendFrameForAnalysis(false),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
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") {
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"), "")) || QString(filter->get("kdenlive_ix")) == index) {
+ 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
filter = clipService.filter(ct);
}
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
refresh();
return success;
}
// 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"), "")) || QString(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) {
filter = clipService.filter(ct);
}
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
if (doRefresh) refresh();
return success;
}
}
Mlt::Service clipService(clip->get_service());
- m_isBlocked = true;
int duration = clip->get_playtime();
if (doRefresh) {
// Check if clip is visible in monitor
const int filter_ix = params.paramValue("kdenlive_ix").toInt();
const QString region = params.paramValue("region");
int ct = 0;
+ m_isBlocked = true;
+ mlt_service_lock(service.get_service());
+
Mlt::Filter *filter = service.filter(ct);
while (filter) {
if (filter->get_int("kdenlive_ix") == filter_ix) {
filter = service.filter(ct);
}
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
if (doRefresh) refresh();
return true;
}
} else {
kDebug() << "filter is NULL";
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
return false;
}
params.removeParam("kdenlive_id");
service.attach(*filter);
}
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
if (doRefresh) refresh();
return true;
}
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (QString(filter->get("kdenlive_ix")) == index) {
+ if (filter->get_int("kdenlive_ix") == index.toInt()) {
break;
}
ct++;
// 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;
- success = mltAddTrackEffect(track, params);
+ if (position < GenTime()) success = mltAddTrackEffect(track, params);
+ else success = mltAddEffect(track, position, params);
if (!success) kDebug() << "// ERROR Adding effect : " << index;
return success;
}
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (QString(filter->get("kdenlive_ix")) == index) {
+ if (filter->get_int("kdenlive_ix") == index.toInt()) {
break;
}
ct++;
return doc.toString();
}
+
+void Render::sendFrameUpdate()
+{
+ if (m_mltProducer) {
+ Mlt::Frame * frame = m_mltProducer->get_frame();
+ emitFrameUpdated(*frame);
+ delete frame;
+ }
+}
+
+
#include "renderer.moc"