* *
***************************************************************************/
-#include <stdlib.h>
-#include <QTimer>
-#include <QDir>
-#include <QApplication>
+#include "renderer.h"
+#include "kdenlivesettings.h"
+#include "kthumb.h"
+#include "definitions.h"
+
+#include <mlt++/Mlt.h>
#include <KDebug>
#include <KStandardDirs>
#include <KLocale>
#include <KTemporaryFile>
-#include "renderer.h"
-#include "kdenlivesettings.h"
-#include "kthumb.h"
-#include "definitions.h"
+#include <QTimer>
+#include <QDir>
+#include <QApplication>
+
+#include <stdlib.h>
+
-#include <mlt++/Mlt.h>
+static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
+{
+ if (level > MLT_LOG_ERROR) return;
+ QString error;
+ QApplication::postEvent(qApp->activeWindow() , new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
+}
-static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) {
- // detect if the producer has finished playing. Is there a better way to do it ?
+
+static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+{
+ // detect if the producer has finished playing. Is there a better way to do it?
if (self->m_isBlocked) return;
if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) {
self->emitConsumerStopped();
}
}
-Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(winid), m_externalwinid(extid), m_framePosition(0), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false), m_isZoneMode(false), m_isLoopMode(false) {
- kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
- refreshTimer = new QTimer(this);
- connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
+Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) :
+ QObject(parent),
+ m_isBlocked(0),
+ m_name(rendererName),
+ m_mltConsumer(NULL),
+ m_mltProducer(NULL),
+ m_framePosition(0),
+ m_isZoneMode(false),
+ m_isLoopMode(false),
+ m_isSplitView(false),
+ m_blackClip(NULL),
+ m_winid(winid)
+{
+ kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
+ m_refreshTimer = new QTimer(this);
+ connect(m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
/*if (rendererName == "project") m_monitorId = 10000;
else m_monitorId = 10001;*/
- osdTimer = new QTimer(this);
- connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
-
- m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties");
+ m_osdTimer = new QTimer(this);
+ connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
buildConsumer();
m_mltProducer->set_speed(0.0);
}
-Render::~Render() {
+Render::~Render()
+{
+ m_isBlocked = 1;
closeMlt();
}
-void Render::closeMlt() {
- delete osdTimer;
- delete refreshTimer;
- if (m_mltConsumer)
- delete m_mltConsumer;
- if (m_mltProducer)
- delete m_mltProducer;
- if (m_blackClip) delete m_blackClip;
+void Render::closeMlt()
+{
+ delete m_osdTimer;
+ delete m_refreshTimer;
+ delete m_mltConsumer;
+ delete m_mltProducer;
+ delete m_blackClip;
//delete m_osdInfo;
}
-void Render::buildConsumer() {
+void Render::buildConsumer()
+{
char *tmp;
m_activeProfile = KdenliveSettings::current_profile();
tmp = decodedString(m_activeProfile);
setenv("MLT_PROFILE", tmp, 1);
- if (m_blackClip) delete m_blackClip;
+ delete m_blackClip;
m_blackClip = NULL;
m_mltProfile = new Mlt::Profile(tmp);
m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
+ tmp = decodedString(KdenliveSettings::window_background().name());
+ m_mltConsumer->set("window_background", tmp);
+ delete [] tmp;
+ // FIXME: the event object returned by the listen gets leaked...
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
m_mltConsumer->set("rescale", "nearest");
+ mlt_log_set_callback(kdenlive_callback);
QString audioDevice = KdenliveSettings::audiodevicename();
if (!audioDevice.isEmpty()) {
}
QString audioDriver = KdenliveSettings::audiodrivername();
+
+ /*
+ // Disabled because the "auto" detected driver was sometimes wrong
+ if (audioDriver.isEmpty())
+ audioDriver = KdenliveSettings::autoaudiodrivername();
+ */
+
if (!audioDriver.isEmpty()) {
tmp = decodedString(audioDriver);
m_mltConsumer->set("audio_driver", tmp);
}
-int Render::resetProfile() {
+int Render::resetProfile()
+{
if (!m_mltConsumer) return 0;
if (m_activeProfile == KdenliveSettings::current_profile()) {
kDebug() << "reset to same profile, nothing to do";
setSceneList(scene, pos);
/*char *tmp = decodedString(scene);
- Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
+ Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp);
delete[] tmp;
m_mltProducer = producer;
m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
}
/** Wraps the VEML command of the same name; Seeks the renderer clip to the given time. */
-void Render::seek(GenTime time) {
+void Render::seek(GenTime time)
+{
if (!m_mltProducer)
return;
m_isBlocked = false;
}
//static
-char *Render::decodedString(QString str) {
+char *Render::decodedString(QString str)
+{
/*QCString fn = QFile::encodeName(str);
char *t = new char[fn.length() + 1];
strcpy(t, (const char *)fn);*/
return pix;
}
*/
-const int Render::renderWidth() const {
+int Render::renderWidth() const
+{
return (int)(m_mltProfile->height() * m_mltProfile->dar());
}
-const int Render::renderHeight() const {
+int Render::renderHeight() const
+{
return m_mltProfile->height();
}
-QPixmap Render::extractFrame(int frame_position, int width, int height) {
+QPixmap Render::extractFrame(int frame_position, int width, int height)
+{
if (width == -1) {
width = renderWidth();
height = renderHeight();
- }
+ } else if (width % 2 == 1) width++;
QPixmap pix(width, height);
if (!m_mltProducer) {
pix.fill(Qt::black);
return KThumb::getFrame(m_mltProducer, frame_position, width, height);
}
-QPixmap Render::getImageThumbnail(KUrl url, int width, int height) {
+QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/)
+{
QImage im;
QPixmap pixmap;
if (url.fileName().startsWith(".all.")) { // check for slideshow
filter << "*." + fileType;
filter << "*." + fileType.toUpper();
more = dir.entryList(filter, QDir::Files);
- im.load(url.directory() + "/" + more.at(0));
+ im.load(url.directory() + '/' + more.at(0));
} else im.load(url.path());
//pixmap = im.scaled(width, height);
return pixmap;
more = dir.entryList( QDir::Files );
for ( it = more.begin() ; it != more.end() ; ++it ) {
if ((*it).endsWith("."+fileType, Qt::CaseInsensitive)) {
- if (!im.load(url.directory() + "/" + *it))
- kDebug()<<"++ ERROR LOADIN IMAGE: "<<url.directory() + "/" + *it;
+ if (!im.load(url.directory() + '/' + *it))
+ kDebug()<<"++ ERROR LOADIN IMAGE: "<<url.directory() + '/' + *it;
break;
}
}
}*/
-double Render::consumerRatio() const {
+double Render::consumerRatio() const
+{
if (!m_mltConsumer) return 1.0;
return (m_mltConsumer->get_double("aspect_ratio_num") / m_mltConsumer->get_double("aspect_ratio_den"));
}
-int Render::getLength() {
+int Render::getLength()
+{
if (m_mltProducer) {
// kDebug()<<"////// LENGTH: "<<mlt_producer_get_playtime(m_mltProducer->get_producer());
return 0;
}
-bool Render::isValid(KUrl url) {
+bool Render::isValid(KUrl url)
+{
char *tmp = decodedString(url.path());
Mlt::Producer producer(*m_mltProfile, tmp);
delete[] tmp;
return true;
}
-const double Render::dar() const {
+double Render::dar() const
+{
return m_mltProfile->dar();
}
-void Render::slotSplitView(bool doit) {
+void Render::slotSplitView(bool doit)
+{
m_isSplitView = doit;
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
tmp = "0,50%:50%x50%";
break;
case 3:
+ default:
tmp = "50%,50%:50%x50%";
break;
}
}
}
-void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
- int height = 50;
- int width = (int)(height * m_mltProfile->dar());
- QMap < QString, QString > filePropertyMap;
- QMap < QString, QString > metadataPropertyMap;
-
- KUrl url = KUrl(xml.attribute("resource", QString::null));
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer)
+{
+ KUrl url = KUrl(xml.attribute("resource", QString()));
Mlt::Producer *producer = NULL;
if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap);
+ emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
return;
}
if (xml.attribute("type").toInt() == COLOR) {
char *tmp = decodedString("colour:" + xml.attribute("colour"));
- producer = new Mlt::Producer(*m_mltProfile, "fezzik", tmp);
+ producer = new Mlt::Producer(*m_mltProfile, 0, tmp);
delete[] tmp;
} else if (url.isEmpty()) {
QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
+ QDomElement mlt = doc.createElement("mlt");
QDomElement play = doc.createElement("playlist");
- doc.appendChild(westley);
- westley.appendChild(play);
+ doc.appendChild(mlt);
+ mlt.appendChild(play);
play.appendChild(doc.importNode(xml, true));
char *tmp = decodedString(doc.toString());
- producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
+ producer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
delete[] tmp;
} else {
- QString urlpath = url.path();
- /*if (urlpath.contains(':')) {
- if (!urlpath.startsWith("file:")) urlpath.prepend("file:");
- char *tmp = decodedString(urlpath);
- producer = new Mlt::Producer(*m_mltProfile, "avformat", tmp);
- delete[] tmp;
- }
- else {*/
- char *tmp = decodedString(urlpath);
+ char *tmp = decodedString(url.path());
producer = new Mlt::Producer(*m_mltProfile, tmp);
delete[] tmp;
-
- if (xml.hasAttribute("force_aspect_ratio")) {
- double aspect = xml.attribute("force_aspect_ratio").toDouble();
- if (aspect > 0) producer->set("force_aspect_ratio", aspect);
- }
- if (xml.hasAttribute("threads")) {
- int threads = xml.attribute("threads").toInt();
- if (threads != 1) producer->set("threads", threads);
- }
- if (xml.hasAttribute("video_index")) {
- int vindex = xml.attribute("video_index").toInt();
- if (vindex != 0) producer->set("video_index", vindex);
- }
- if (xml.hasAttribute("audio_index")) {
- int aindex = xml.attribute("audio_index").toInt();
- if (aindex != 0) producer->set("audio_index", aindex);
- }
- //}
}
if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
- kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: ";
- emit removeInvalidClip(clipId);
+ kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
+ emit removeInvalidClip(clipId, replaceProducer);
+ delete producer;
return;
}
+ if (xml.hasAttribute("force_aspect_ratio")) {
+ double aspect = xml.attribute("force_aspect_ratio").toDouble();
+ if (aspect > 0) producer->set("force_aspect_ratio", aspect);
+ }
+ if (xml.hasAttribute("threads")) {
+ int threads = xml.attribute("threads").toInt();
+ if (threads != 1) producer->set("threads", threads);
+ }
+ if (xml.hasAttribute("video_index")) {
+ int vindex = xml.attribute("video_index").toInt();
+ if (vindex != 0) producer->set("video_index", vindex);
+ }
+ if (xml.hasAttribute("audio_index")) {
+ int aindex = xml.attribute("audio_index").toInt();
+ if (aindex != 0) producer->set("audio_index", aindex);
+ }
+
if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
char *tmp = decodedString(clipId);
producer->set("id", tmp);
delete[] tmp;
+
+ if (!replaceProducer && xml.hasAttribute("file_hash")) {
+ // Clip already has all properties
+ emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
+ return;
+ }
+
+ int height = 50;
+ int width = (int)(height * m_mltProfile->dar());
+ QMap < QString, QString > filePropertyMap;
+ QMap < QString, QString > metadataPropertyMap;
+
int frameNumber = xml.attribute("thumbnail", "0").toInt();
if (frameNumber != 0) producer->seek(frameNumber);
- mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer());
filePropertyMap["duration"] = QString::number(producer->get_playtime());
//kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
filePropertyMap["fps"] = producer->get("source_fps");
if (frame && frame->is_valid()) {
- filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + "x" + QString::number(frame->get_int("height"));
+ filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
filePropertyMap["frequency"] = QString::number(frame->get_int("frequency"));
filePropertyMap["channels"] = QString::number(frame->get_int("channels"));
filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
if (frame->get_int("test_image") == 0) {
- if (url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
+ if (url.path().endsWith(".mlt") || url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
filePropertyMap["type"] = "playlist";
metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
} else if (frame->get_int("test_audio") == 0)
else
filePropertyMap["type"] = "video";
- mlt_image_format format = mlt_image_yuv422;
- int frame_width = 0;
- int frame_height = 0;
- //frame->set("rescale.interp", "hyper");
- frame->set("normalised_height", height);
- frame->set("normalised_width", width);
+ mlt_image_format format = mlt_image_rgb24a;
+ int frame_width = width;
+ int frame_height = height;
QPixmap pix(width, height);
-
uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
- uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4);
- mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height);
- QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
+ QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
if (!image.isNull()) {
pix = QPixmap::fromImage(image.rgbSwapped());
} else
pix.fill(Qt::black);
- mlt_pool_release(new_image);
- emit replyGetImage(clipId, 0, pix, width, height);
+ emit replyGetImage(clipId, pix);
} else if (frame->get_int("test_audio") == 0) {
QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height));
- emit replyGetImage(clipId, 0, pixmap, width, height);
+ emit replyGetImage(clipId, pixmap);
filePropertyMap["type"] = "audio";
}
}
char property[200];
if (producer->get_int("video_index") > -1) {
/*if (context->duration == AV_NOPTS_VALUE) {
- kDebug() << " / / / / / / / /ERRROR / / / CLIP HAS UNKNOWN DURATION";
+ kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION";
emit removeInvalidClip(clipId);
+ delete producer;
return;
}*/
// Get the video_index
}
if (KdenliveSettings::dropbframes()) {
- kDebug() << "// LOOKING FOR H264 on: " << default_video;
+ kDebug() << "// LOOKING FOR H264 on: " << default_video;
snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
kDebug() << "PROP: " << property << " = " << producer->get(property);
if (producer->get(property) && strcmp(producer->get(property), "h264") == 0) {
- kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
+ kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
producer->set("skip_loop_filter", "all");
producer->set("skip_frame", "bidir");
}
QString name = metadata.get_name(i);
QString value = QString::fromUtf8(metadata.get(i));
if (name.endsWith("markup") && !value.isEmpty())
- metadataPropertyMap[ name.section(".", 0, -2)] = value;
+ metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap);
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
kDebug() << "REquested fuile info for: " << url.path();
- if (frame) delete frame;
- //if (producer) delete producer;
+ delete frame;
+ // FIXME: should delete this to avoid a leak...
+ //delete producer;
}
-/** Create the producer from the Westley QDomDocument */
+/** Create the producer from the MLT XML QDomDocument */
#if 0
-void Render::initSceneList() {
+void Render::initSceneList()
+{
kDebug() << "-------- INIT SCENE LIST ------_";
QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
- doc.appendChild(westley);
+ QDomElement mlt = doc.createElement("mlt");
+ doc.appendChild(mlt);
QDomElement prod = doc.createElement("producer");
prod.setAttribute("resource", "colour");
prod.setAttribute("colour", "red");
QDomElement playlist5 = doc.createElement("playlist");
multitrack.appendChild(playlist5);
tractor.appendChild(multitrack);
- westley.appendChild(tractor);
+ mlt.appendChild(tractor);
// kDebug()<<doc.toString();
/*
- QString tmp = QString("<westley><producer resource=\"colour\" colour=\"red\" id=\"red\" /><tractor><multitrack><playlist></playlist><playlist></playlist><playlist /><playlist /><playlist></playlist></multitrack></tractor></westley>");*/
+ QString tmp = QString("<mlt><producer resource=\"colour\" colour=\"red\" id=\"red\" /><tractor><multitrack><playlist></playlist><playlist></playlist><playlist /><playlist /><playlist></playlist></multitrack></tractor></mlt>");*/
setSceneList(doc, 0);
}
#endif
-/** Create the producer from the Westley QDomDocument */
-void Render::setProducer(Mlt::Producer *producer, int position) {
- if (m_winid == -1) return;
+/** Create the producer from the MLT XML QDomDocument */
+int Render::setProducer(Mlt::Producer *producer, int position)
+{
+ if (m_winid == -1) return -1;
if (m_mltConsumer) {
m_mltConsumer->stop();
- } else return;
+ } else return -1;
m_mltConsumer->purge();
m_mltProducer->set("skip_loop_filter", "all");
m_mltProducer->set("skip_frame", "bidir");
}*/
- if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
+ if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
m_fps = m_mltProducer->get_fps();
- connectPlaylist();
+ int error = connectPlaylist();
if (position != -1) {
m_mltProducer->seek(position);
emit rendererPosition(position);
}
m_isBlocked = false;
+ return error;
}
-/** Create the producer from the Westley QDomDocument */
-void Render::setSceneList(QDomDocument list, int position) {
- setSceneList(list.toString(), position);
+/** 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 Westley QDomDocument */
-void Render::setSceneList(QString playlist, int position) {
- if (m_winid == -1) return;
+/** Create the producer from the MLT XML QDomDocument */
+int Render::setSceneList(QString playlist, int position)
+{
+ if (m_winid == -1) return -1;
m_isBlocked = true;
+ int error;
+ qDeleteAll(m_slowmotionProducers.values());
m_slowmotionProducers.clear();
//kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
- if (m_mltConsumer) {
+ if (m_mltConsumer == NULL) {
+ kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER";
+ m_isBlocked = false;
+ return -1;
+ }
+
+ if (!m_mltConsumer->is_stopped()) {
m_mltConsumer->stop();
//m_mltConsumer->set("refresh", 0);
- } else {
- m_isBlocked = false;
- return;
}
if (m_mltProducer) {
blockSignals(true);
char *tmp = decodedString(playlist);
- m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
- delete[] tmp;
+ m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
if (!m_mltProducer || !m_mltProducer->is_valid()) {
kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
+ m_mltProducer = m_blackClip->cut(0, 50);
}
+ delete[] tmp;
+
m_mltProducer->optimise();
/*if (KdenliveSettings::osdtimecode()) {
delete m_osdInfo;
QString attr = "attr_check";
mlt_filter filter = mlt_factory_filter( "data_feed", (char*) attr.ascii() );
- mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik", 1 );
+ mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_loader", 1 );
mlt_producer_attach( m_mltProducer->get_producer(), filter );
mlt_filter_close( filter );
}*/
m_fps = m_mltProducer->get_fps();
- kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
- connectPlaylist();
- fillSlowMotionProducers();
if (position != 0) {
- //TODO: seek to correct place after opening project.
- // Needs to be done from another place since it crashes here.
+ // Seek to correct place after opening project.
m_mltProducer->seek(position);
}
+
+ kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
+ error = connectPlaylist();
+ fillSlowMotionProducers();
+
m_isBlocked = false;
blockSignals(false);
+ emit refreshDocumentProducers();
+ return error;
//kDebug()<<"// SETSCN LST, POS: "<<position;
//if (position != 0) emit rendererPosition(position);
}
-/** Create the producer from the Westley QDomDocument */
-QString Render::sceneList() {
+/** Create the producer from the MLT XML QDomDocument */
+const QString Render::sceneList()
+{
QString playlist;
- Mlt::Consumer westleyConsumer(*m_mltProfile , "westley:kdenlive_playlist");
+ Mlt::Consumer xmlConsumer(*m_mltProfile , "xml:kdenlive_playlist");
m_mltProducer->optimise();
- westleyConsumer.set("terminate_on_pause", 1);
+ xmlConsumer.set("terminate_on_pause", 1);
Mlt::Producer prod(m_mltProducer->get_producer());
bool split = m_isSplitView;
if (split) slotSplitView(false);
- westleyConsumer.connect(prod);
- westleyConsumer.start();
- while (!westleyConsumer.is_stopped()) {}
- playlist = QString::fromUtf8(westleyConsumer.get("kdenlive_playlist"));
+ xmlConsumer.connect(prod);
+ xmlConsumer.start();
+ while (!xmlConsumer.is_stopped()) {}
+ playlist = QString::fromUtf8(xmlConsumer.get("kdenlive_playlist"));
if (split) slotSplitView(true);
return playlist;
}
-void Render::saveSceneList(QString path, QDomElement kdenliveData) {
+bool Render::saveSceneList(QString path, QDomElement kdenliveData)
+{
QFile file(path);
QDomDocument doc;
doc.setContent(sceneList(), false);
if (!kdenliveData.isNull()) {
// add Kdenlive specific tags
- QDomNode wes = doc.elementsByTagName("westley").at(0);
- wes.appendChild(doc.importNode(kdenliveData, true));
+ QDomNode mlt = doc.elementsByTagName("mlt").at(0);
+ mlt.appendChild(doc.importNode(kdenliveData, true));
}
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
kWarning() << "////// ERROR writing to file: " << path;
- return;
+ return false;
+ }
+ file.write(doc.toString().toUtf8());
+ if (file.error() != QFile::NoError) {
+ file.close();
+ return false;
}
- QTextStream out(&file);
- out << doc.toString();
file.close();
+ return true;
}
-void Render::saveZone(KUrl url, QString desc, QPoint zone) {
+void Render::saveZone(KUrl url, QString desc, QPoint zone)
+{
kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name;
- char *tmppath = decodedString("westley:" + url.path());
- Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath);
+ char *tmppath = decodedString("xml:" + url.path());
+ Mlt::Consumer xmlConsumer(*m_mltProfile , tmppath);
m_mltProducer->optimise();
delete[] tmppath;
- westleyConsumer.set("terminate_on_pause", 1);
+ xmlConsumer.set("terminate_on_pause", 1);
if (m_name == "clip") {
Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y());
tmppath = decodedString(desc);
list.insert_at(0, prod, 0);
list.set("title", tmppath);
delete[] tmppath;
- westleyConsumer.connect(list);
+ xmlConsumer.connect(list);
} else {
//TODO: not working yet, save zone from timeline
tmppath = decodedString(desc);
//prod->set("title", tmppath);
delete[] tmppath;
- westleyConsumer.connect(*p1); //list);
+ xmlConsumer.connect(*p1); //list);
}
- westleyConsumer.start();
+ xmlConsumer.start();
}
-const double Render::fps() const {
+double Render::fps() const
+{
return m_fps;
}
-void Render::connectPlaylist() {
- if (!m_mltConsumer) return;
+int Render::connectPlaylist()
+{
+ if (!m_mltConsumer) return -1;
//m_mltConsumer->set("refresh", "0");
m_mltConsumer->connect(*m_mltProducer);
m_mltProducer->set_speed(0);
- m_mltConsumer->start();
+ if (m_mltConsumer->start() == -1) {
+ // ARGH CONSUMER BROKEN!!!!
+ KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
+ emit blockMonitors();
+ delete m_mltProducer;
+ m_mltProducer = NULL;
+ return -1;
+ }
emit durationChanged(m_mltProducer->get_playtime());
+ return 0;
//refresh();
- /*
- if (m_mltConsumer->start() == -1) {
- KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
- m_mltConsumer = NULL;
- }
- else {
- refresh();
- }*/
}
-void Render::refreshDisplay() {
+void Render::refreshDisplay()
+{
if (!m_mltProducer) return;
//m_mltConsumer->set("refresh", 0);
- mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
+ //mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
/*if (KdenliveSettings::osdtimecode()) {
mlt_properties_set_int( properties, "meta.attr.timecode", 1);
mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#");
refresh();
}
-void Render::setVolume(double volume) {
+void Render::setVolume(double /*volume*/)
+{
if (!m_mltConsumer || !m_mltProducer) return;
/*osdTimer->stop();
m_mltConsumer->set("refresh", 0);
if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
}*/
refresh();
- osdTimer->setSingleShot(2500);
+ m_osdTimer->setSingleShot(2500);
}
-void Render::slotOsdTimeout() {
+void Render::slotOsdTimeout()
+{
mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
mlt_properties_set_int(properties, "meta.attr.osdvolume", 0);
mlt_properties_set(properties, "meta.attr.osdvolume.markup", NULL);
refresh();
}
-void Render::start() {
+void Render::start()
+{
kDebug() << "----- STARTING MONITOR: " << m_name;
if (m_winid == -1) {
kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART";
return;
}
-
if (m_mltConsumer && m_mltConsumer->is_stopped()) {
kDebug() << "----- MONITOR: " << m_name << " WAS STOPPED";
if (m_mltConsumer->start() == -1) {
KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
- m_mltConsumer = NULL;
- return;
+ emit blockMonitors();
+ delete m_mltProducer;
+ m_mltProducer = NULL;
} else {
kDebug() << "----- MONITOR: " << m_name << " REFRESH";
m_isBlocked = false;
m_isBlocked = false;
}
-void Render::clear() {
+void Render::clear()
+{
kDebug() << " ********* RENDER CLEAR";
if (m_mltConsumer) {
//m_mltConsumer->set("refresh", 0);
}
}
-void Render::stop() {
+void Render::stop()
+{
+ if (m_mltProducer == NULL) return;
if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
kDebug() << "///////////// RENDER STOPPED: " << m_name;
m_isBlocked = true;
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
m_mltConsumer->stop();
// delete m_mltConsumer;
// m_mltConsumer = NULL;
kDebug() << "///////////// RENDER STOP3-------";
}
-void Render::stop(const GenTime & startTime) {
+void Render::stop(const GenTime & startTime)
+{
kDebug() << "///////////// RENDER STOP-------2";
if (m_mltProducer) {
m_mltConsumer->purge();
}
-void Render::pause() {
+void Render::pause()
+{
if (!m_mltProducer || !m_mltConsumer)
return;
if (m_mltProducer->get_speed() == 0.0) return;
m_mltConsumer->purge();
}
-void Render::switchPlay() {
+void Render::switchPlay()
+{
if (!m_mltProducer || !m_mltConsumer)
return;
if (m_isZoneMode) resetZoneMode();
//refresh();
}
-void Render::play(double speed) {
+void Render::play(double speed)
+{
if (!m_mltProducer)
return;
// if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
refresh();
}
-void Render::play(const GenTime & startTime) {
+void Render::play(const GenTime & startTime)
+{
if (!m_mltProducer || !m_mltConsumer)
return;
m_isBlocked = false;
m_mltConsumer->set("refresh", 1);
}
-void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) {
+void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
+{
if (!m_mltProducer || !m_mltConsumer)
return;
//m_mltProducer->set("eof", "loop");
playZone(startTime, stopTime);
}
-void Render::playZone(const GenTime & startTime, const GenTime & stopTime) {
+void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
+{
if (!m_mltProducer || !m_mltConsumer)
return;
m_isBlocked = false;
+ if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1;
m_mltProducer->set("out", stopTime.frames(m_fps));
m_mltProducer->seek((int)(startTime.frames(m_fps)));
m_mltProducer->set_speed(1.0);
m_isZoneMode = true;
}
-void Render::resetZoneMode() {
- m_mltProducer->set("out", m_mltProducer->get_length() - 1);
+void Render::resetZoneMode()
+{
+ if (!m_isZoneMode && !m_isLoopMode) return;
+ m_mltProducer->set("out", m_originalOut);
//m_mltProducer->set("eof", "pause");
m_isZoneMode = false;
m_isLoopMode = false;
}
-void Render::seekToFrame(int pos) {
+void Render::seekToFrame(int pos)
+{
//kDebug()<<" ********* RENDER SEEK TO POS";
if (!m_mltProducer)
return;
refresh();
}
-void Render::askForRefresh() {
+void Render::seekToFrameDiff(int diff)
+{
+ //kDebug()<<" ********* RENDER SEEK TO POS";
+ if (!m_mltProducer)
+ return;
+ m_isBlocked = false;
+ resetZoneMode();
+ m_mltProducer->seek(m_mltProducer->position() + diff);
+ refresh();
+}
+
+void Render::askForRefresh()
+{
// Use a Timer so that we don't refresh too much
- refreshTimer->start(200);
+ m_refreshTimer->start(300);
}
-void Render::doRefresh() {
+void Render::doRefresh()
+{
// Use a Timer so that we don't refresh too much
if (!m_isBlocked && m_mltConsumer) m_mltConsumer->set("refresh", 1);
}
-void Render::refresh() {
+void Render::refresh()
+{
if (!m_mltProducer || m_isBlocked)
return;
- refreshTimer->stop();
+ m_refreshTimer->stop();
if (m_mltConsumer) {
m_mltConsumer->set("refresh", 1);
}
}
-double Render::playSpeed() {
+void Render::setDropFrames(bool show)
+{
+ if (m_mltConsumer) {
+ int dropFrames = 1;
+ if (show == false) dropFrames = 0;
+ m_mltConsumer->stop();
+ m_mltConsumer->set("play.real_time", dropFrames);
+ if (m_mltConsumer->start() == -1) {
+ emit blockMonitors();
+ delete m_mltProducer;
+ m_mltProducer = NULL;
+ }
+
+ }
+}
+
+double Render::playSpeed()
+{
if (m_mltProducer) return m_mltProducer->get_speed();
return 0.0;
}
-GenTime Render::seekPosition() const {
+GenTime Render::seekPosition() const
+{
if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps);
else return GenTime();
}
+int Render::seekFramePosition() const
+{
+ if (m_mltProducer) return (int) m_mltProducer->position();
+ return 0;
+}
-const QString & Render::rendererName() const {
+const QString & Render::rendererName() const
+{
return m_name;
}
-void Render::emitFrameNumber(double position) {
+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::emitConsumerStopped()
+{
// This is used to know when the playing stopped
if (m_mltProducer) {
double pos = m_mltProducer->position();
-void Render::exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime) {
+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) {
+void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
+{
if (!m_mltProducer) {
KMessageBox::sorry(qApp->activeWindow(), i18n("There is no clip, cannot extract frame."));
return;
}
- int height = 1080;//KdenliveSettings::defaultheight();
- int width = 1940; //KdenliveSettings::displaywidth();
+ //int height = 1080;//KdenliveSettings::defaultheight();
+ //int width = 1940; //KdenliveSettings::displaywidth();
//TODO: rewrite
QPixmap pix; // = KThumb::getFrame(m_mltProducer, -1, width, height);
/*
/** MLT PLAYLIST DIRECT MANIPULATON **/
-void Render::mltCheckLength() {
+void Render::mltCheckLength()
+{
//kDebug()<<"checking track length: "<<track<<"..........";
Mlt::Service service(m_mltProducer->get_service());
Mlt::Tractor tractor(service);
int trackNb = tractor.count();
- double duration = 0;
- double trackDuration;
+ int duration = 0;
+ int trackDuration;
if (trackNb == 1) {
Mlt::Producer trackProducer(tractor.track(0));
- Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- duration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
+ duration = trackProducer.get_playtime() - 1;
m_mltProducer->set("out", duration);
- emit durationChanged((int) duration);
+ emit durationChanged(duration);
return;
}
while (trackNb > 1) {
Mlt::Producer trackProducer(tractor.track(trackNb - 1));
- Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- trackDuration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
+ trackDuration = trackProducer.get_playtime() - 1;
//kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration;
if (trackDuration > duration) duration = trackDuration;
}
Mlt::Producer blackTrackProducer(tractor.track(0));
- Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
- double blackDuration = Mlt::Producer(blackTrackPlaylist.get_producer()).get_playtime() - 1;
- if (blackDuration != duration) {
- blackTrackPlaylist.remove_region(0, (int)blackDuration);
- int i = 0;
- int dur = (int)duration;
- QDomDocument doc;
- QDomElement black = doc.createElement("producer");
- black.setAttribute("mlt_service", "colour");
- black.setAttribute("colour", "black");
- black.setAttribute("id", "black");
- ItemInfo info;
- info.track = 0;
- while (dur > 14000) {
- info.startPos = GenTime(i * 14000, m_fps);
- info.endPos = info.startPos + GenTime(13999, m_fps);
- mltInsertClip(info, black, m_blackClip);
- dur = dur - 14000;
- i++;
- }
- if (dur > 0) {
- info.startPos = GenTime(i * 14000, m_fps);
- info.endPos = info.startPos + GenTime(dur, m_fps);
- mltInsertClip(info, black, m_blackClip);
+ if (blackTrackProducer.get_playtime() - 1 != duration) {
+ Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
+ Mlt::Producer *blackclip = blackTrackPlaylist.get_clip(0);
+ if (duration > m_blackClip->get_length()) {
+ m_blackClip->set("length", duration);
+ if (blackclip) blackclip->set("length", duration);
}
+ if (blackclip == NULL || blackclip->is_blank() || blackTrackPlaylist.count() != 1) {
+ blackTrackPlaylist.clear();
+ blackTrackPlaylist.append(*m_blackClip, 0, duration - 1);
+ } else blackTrackPlaylist.resize_clip(0, 0, duration - 1);
+ delete blackclip;
m_mltProducer->set("out", duration);
- emit durationChanged((int)duration);
+ emit durationChanged(duration);
}
}
-void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
- if (!m_mltProducer) {
- kDebug() << "PLAYLIST NOT INITIALISED //////";
+void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod)
+{
+ if (m_mltProducer == NULL) {
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
return;
}
Mlt::Producer parentProd(m_mltProducer->parent());
if (parentProd.get_producer() == NULL) {
- kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return;
}
Mlt::Service service(parentProd.get_service());
Mlt::Tractor tractor(service);
+ if (info.track > tractor.count() - 1) {
+ kDebug() << "ERROR TRYING TO INSERT CLIP ON TRACK " << info.track << ", at POS: " << info.startPos.frames(25);
+ return;
+ }
mlt_service_lock(service.get_service());
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (element.attribute("speed", "1.0").toDouble() != 1.0) {
// We want a slowmotion producer
double speed = element.attribute("speed", "1.0").toDouble();
- QString url = prod->get("resource");
- url.append("?" + QString::number(speed));
+ QString url = QString::fromUtf8(prod->get("resource"));
+ url.append('?' + QString::number(speed));
Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
if (!slowprod || slowprod->get_producer() == NULL) {
char *tmp = decodedString(url);
delete[] tmp;
QString id = prod->get("id");
if (id.contains('_')) id = id.section('_', 0, 0);
- QString producerid = "slowmotion:" + id + ":" + QString::number(speed);
+ QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
tmp = decodedString(producerid);
slowprod->set("id", tmp);
delete[] tmp;
}
-void Render::mltCutClip(int track, GenTime position) {
+void Render::mltCutClip(int track, GenTime position)
+{
m_isBlocked = true;
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
int cutPos = (int) position.frames(m_fps);
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (filter->is_valid() && filter->get("kdenlive_id") != "") {
+ // Only duplicate Kdenlive filters, and skip the fade in effects
+ if (filter->is_valid() && strcmp(filter->get("kdenlive_id"), "") && strcmp(filter->get("kdenlive_id"), "fadein") && strcmp(filter->get("kdenlive_id"), "fade_from_black")) {
// looks like there is no easy way to duplicate a filter,
// so we will create a new one and duplicate its properties
Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service"));
if (dup && dup->is_valid()) {
Mlt::Properties entries(filter->get_properties());
- for (int i = 0;i < entries.count();i++) {
+ for (int i = 0; i < entries.count(); i++) {
dup->set(entries.get_name(i), entries.get(i));
}
dupService.attach(*dup);
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
m_isBlocked = false;
}
-void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
+void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod)
+{
// TODO: optimize
mltRemoveClip(info.track, info.startPos);
mltInsertClip(info, element, prod);
}
-bool Render::mltRemoveClip(int track, GenTime position) {
+bool Render::mltRemoveClip(int track, GenTime position)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
Mlt::Tractor tractor(service);
+ mlt_service_lock(service.get_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));
- /* // Display playlist info
- kDebug()<<"//// BEFORE";
- for (int i = 0; i < trackPlaylist.count(); i++) {
+ // Display playlist info
+ //kDebug() << "//// BEFORE -( " << position.frames(m_fps) << " )-------------------------------";
+ /*for (int i = 0; i < trackPlaylist.count(); i++) {
int blankStart = trackPlaylist.clip_start(i);
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
-
if (trackPlaylist.is_blank(clipIndex)) {
- kDebug() << "// WARMNING, TRYING TO REMOVE A BLANK: " << clipIndex << ", AT: " << position.frames(25);
+ kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(25);
+ mlt_service_unlock(service.get_service());
return false;
}
+ //kDebug()<<"//// Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------";
m_isBlocked = true;
- Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
/*if (QString(clip.parent().get("transparency")).toInt() == 1)
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
-
+ mlt_service_unlock(service.get_service());
if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength();
m_isBlocked = false;
return true;
}
-int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) {
+int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart)
+{
if (!m_mltProducer) {
- kDebug() << "PLAYLIST NOT INITIALISED //////";
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
return -1;
}
Mlt::Producer parentProd(m_mltProducer->parent());
if (parentProd.get_producer() == NULL) {
- kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return -1;
}
return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos;
}
+int Render::mltTrackDuration(int track)
+{
+ if (!m_mltProducer) {
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
+ return -1;
+ }
+ Mlt::Producer parentProd(m_mltProducer->parent());
+ if (parentProd.get_producer() == NULL) {
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ return -1;
+ }
+
+ Mlt::Service service(parentProd.get_service());
+ Mlt::Tractor tractor(service);
+
+ Mlt::Producer trackProducer(tractor.track(track));
+ return trackProducer.get_playtime() - 1;
+}
-void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset) {
+void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset)
+{
if (!m_mltProducer) {
- kDebug() << "PLAYLIST NOT INITIALISED //////";
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
return;
}
Mlt::Producer parentProd(m_mltProducer->parent());
if (parentProd.get_producer() == NULL) {
- kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return;
}
//kDebug()<<"// CLP STRT LST: "<<trackClipStartList;
}
trackPlaylist.consolidate_blanks(0);
}
- // now move transitions
+ // now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipNb = trackPlaylist.count();
+ //int clipNb = trackPlaylist.count();
insertPos = trackClipStartList.value(trackNb - 1);
if (insertPos != -1) {
insertPos += offset;
}
trackNb--;
}
- // now move transitions
+ // now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
m_mltConsumer->set("refresh", 1);
}
-int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod) {
+
+void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest)
+{
+ Mlt::Service sourceService(source->get_service());
+ Mlt::Service destService(dest->get_service());
+
+ // move all effects to the correct producer
+ int ct = 0;
+ Mlt::Filter *filter = sourceService.filter(ct);
+ while (filter) {
+ if (filter->get("kdenlive_ix") != 0) {
+ sourceService.detach(*filter);
+ destService.attach(*filter);
+ } else ct++;
+ filter = sourceService.filter(ct);
+ }
+}
+
+int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod)
+{
m_isBlocked = true;
int newLength = 0;
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
- kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1;
+ //kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1;
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(startPos);
int clipLength = trackPlaylist.clip_length(clipIndex);
- Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
- QString serv = clip.parent().get("mlt_service");
- QString id = clip.parent().get("id");
- kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service");
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+ if (clip == NULL) {
+ return -1;
+ }
+ if (!clip->is_valid() || clip->is_blank()) {
+ // invalid clip
+ delete clip;
+ return -1;
+ }
+ Mlt::Producer clipparent = clip->parent();
+ if (!clipparent.is_valid() || clipparent.is_blank()) {
+ // invalid clip
+ delete clip;
+ return -1;
+ }
+
+ QString serv = clipparent.get("mlt_service");
+ QString id = clipparent.get("id");
+ //kDebug() << "CLIP SERVICE: " << serv;
if (serv == "avformat" && speed != 1.0) {
mlt_service_lock(service.get_service());
- QString url = clip.parent().get("resource");
- url.append("?" + QString::number(speed));
+ QString url = QString::fromUtf8(clipparent.get("resource"));
+ url.append('?' + QString::number(speed));
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);
delete[] tmp;
- QString producerid = "slowmotion:" + id + ":" + QString::number(speed);
+ QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
tmp = decodedString(producerid);
slowprod->set("id", tmp);
delete[] tmp;
GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos;
cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)(info.cropStart.frames(m_fps) / speed + maxLength.frames(m_fps) - 1));
} else cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)((info.cropStart.frames(m_fps) + clipLength) / speed - 1));
+
+ // move all effects to the correct producer
+ mltPasteEffects(clip, cut);
+
trackPlaylist.insert_at(startPos, *cut, 1);
clipIndex = trackPlaylist.get_clip_index_at(startPos);
newLength = trackPlaylist.clip_length(clipIndex);
GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos;
cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)(info.cropStart.frames(m_fps) + maxLength.frames(m_fps) - 1));
} else cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)((info.cropStart + newDuration).frames(m_fps)) - 1);
+
+ // move all effects to the correct producer
+ mltPasteEffects(clip, cut);
+
trackPlaylist.insert_at(startPos, *cut, 1);
clipIndex = trackPlaylist.get_clip_index_at(startPos);
newLength = trackPlaylist.clip_length(clipIndex);
} else if (serv == "framebuffer") {
mlt_service_lock(service.get_service());
- QString url = clip.parent().get("resource");
- url = url.section("?", 0, 0);
- url.append("?" + QString::number(speed));
+ QString url = QString::fromUtf8(clipparent.get("resource"));
+ url = url.section('?', 0, 0);
+ url.append('?' + QString::number(speed));
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);
delete[] tmp;
- QString producerid = "slowmotion:" + id.section(":", 1, 1) + ":" + QString::number(speed);
+ QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed);
tmp = decodedString(producerid);
slowprod->set("id", tmp);
delete[] tmp;
Mlt::Producer *cut;
if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) {
GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos;
- cut = slowprod->cut((int)(info.cropStart.frames(m_fps)), (int)(info.cropStart.frames(m_fps) + maxLength.frames(m_fps) - 1));
+ cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)(info.cropStart.frames(m_fps) / speed + maxLength.frames(m_fps) - 1));
} else cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)((info.cropStart / speed + newDuration).frames(m_fps) - 1));
+ // move all effects to the correct producer
+ mltPasteEffects(clip, cut);
+
trackPlaylist.insert_at(startPos, *cut, 1);
clipIndex = trackPlaylist.get_clip_index_at(startPos);
newLength = trackPlaylist.clip_length(clipIndex);
mlt_service_unlock(service.get_service());
}
+
+ delete clip;
if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength();
m_isBlocked = false;
return newLength;
}
-bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) {
-
+bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh)
+{
+ kDebug() << "// TRYing to remove effect at: " << index;
Mlt::Service service(m_mltProducer->parent().get_service());
bool success = false;
Mlt::Tractor tractor(service);
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if ((index == "-1" && filter->get("kdenlive_id") != "") || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
+ if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
if (clipService.detach(*filter) == 0) success = true;
kDebug() << " / / / DLEETED EFFECT: " << ct;
- } else {
+ } 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);
ct++;
- }
+ } else ct++;
filter = clipService.filter(ct);
}
m_isBlocked = false;
}
-bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh) {
+bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
QString kfr = params.paramValue("keyframes");
if (!kfr.isEmpty()) {
- QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts);
+ QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts);
kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes");
char *starttag = decodedString(params.paramValue("starttag", "start"));
char *endtag = decodedString(params.paramValue("endtag", "end"));
kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
int duration = clip->get_playtime();
- double max = params.paramValue("max").toDouble();
+ //double max = params.paramValue("max").toDouble();
double min = params.paramValue("min").toDouble();
double factor = params.paramValue("factor", "1").toDouble();
params.removeParam("starttag");
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();
+ 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++) {
return true;
}
-bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) {
+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") {
// This is a keyframe effect, to edit it, we remove it and re-add it.
- mltRemoveEffect(track, position, index);
+ mltRemoveEffect(track, position, index, true);
bool success = mltAddEffect(track, position, params);
return success;
}
- // create filter
+ // find filter
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
//int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
if (!clip) {
- kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+ kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
return false;
}
Mlt::Service clipService(clip->get_service());
if (!filter) {
kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT!!!!!";
- // filter was not found, it was probably a disabled filter, so add it to the correct place...
+ // filter was not found, it was probably a disabled filter, so add it to the correct place...
int ct = 0;
filter = clipService.filter(ct);
QList <Mlt::Filter *> filtersList;
m_isBlocked = false;
return success;
}
-
+ mlt_service_lock(service.get_service());
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;
}
+ mlt_service_unlock(service.get_service());
m_isBlocked = false;
refresh();
return true;
}
-void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) {
+void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
+{
- kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
+ kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
//int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
if (!clip) {
- kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+ kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
return;
}
Mlt::Service clipService(clip->get_service());
refresh();
}
-bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) {
+bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
+{
m_isBlocked = true;
-
Mlt::Service service(m_mltProducer->parent().get_service());
-
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
if (trackPlaylist.is_blank_at((int) info.startPos.frames(m_fps))) {
m_isBlocked = false;
return false;
}
+ mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps));
- kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
+ //kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
int previousStart = clip->get_in();
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
int newDuration = (int) clipDuration.frames(m_fps) - 1;
+ int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1);
+ if (newDuration > clip->get_length()) {
+ clip->parent().set("length", newDuration + 1);
+ clip->set("length", newDuration + 1);
+ }
+ 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);
+ trackPlaylist.consolidate_blanks(0);
// skip to next clip
clipIndex++;
- int diff = newDuration - previousDuration;
- kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration;
+ //kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration << ", IX: " << clipIndex << ", MAX: " << trackPlaylist.count();
if (diff > 0) {
// clip was made longer, trim next blank if there is one.
- if (trackPlaylist.is_blank(clipIndex)) {
- int blankStart = trackPlaylist.clip_start(clipIndex);
- int blankDuration = trackPlaylist.clip_length(clipIndex) - 1;
- if (diff - blankDuration == 1) {
- trackPlaylist.remove(clipIndex);
- } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff);
- } else {
- kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex;
+ if (clipIndex < trackPlaylist.count()) {
+ // If this is not the last clip in playlist
+ if (trackPlaylist.is_blank(clipIndex)) {
+ int blankStart = trackPlaylist.clip_start(clipIndex);
+ int blankDuration = trackPlaylist.clip_length(clipIndex) - 1;
+ if (diff > blankDuration) kDebug() << "// ERROR blank clip is not large enough to get back required space!!!";
+ if (diff - blankDuration == 1) {
+ trackPlaylist.remove(clipIndex);
+ } else trackPlaylist.remove_region(blankStart, diff - 1);
+ } else {
+ kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex;
+ }
}
} else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1);
-
trackPlaylist.consolidate_blanks(0);
-
+ mlt_service_unlock(service.get_service());
if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength();
/*if (QString(clip->parent().get("transparency")).toInt() == 1) {
return true;
}
-void Render::mltChangeTrackState(int track, bool mute, bool blind) {
+void Render::mltChangeTrackState(int track, bool mute, bool blind)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
refresh();
}
-bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
+
+bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
+{
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ int frameOffset = (int) diff.frames(m_fps);
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(info.track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) {
+ kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
+ return false;
+ }
+ mlt_service_lock(service.get_service());
+ int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+ if (clip == NULL) {
+ kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!";
+ mlt_service_unlock(service.get_service());
+ return false;
+ }
+ int previousStart = clip->get_in();
+ delete clip;
+ int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
+ m_isBlocked = true;
+ trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset);
+ m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_mltConsumer->set("refresh", 1);
+ return true;
+}
+
+bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
+{
//kDebug() << "//////// RSIZING CLIP from: "<<info.startPos.frames(25)<<" to "<<diff.frames(25);
Mlt::Service service(m_mltProducer->parent().get_service());
int moveFrame = (int) diff.frames(m_fps);
}
mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
- /*int previousStart = trackPlaylist.clip_start(clipIndex);
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/
- //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25);
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
if (clip == NULL) {
kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!";
mlt_service_unlock(service.get_service());
return false;
}
- //m_mltConsumer->set("refresh", 0);
int previousStart = clip->get_in();
+ delete clip;
int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
m_isBlocked = true;
kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
return true;
}
-bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod) {
+bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod)
+{
return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), prod);
}
-void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) {
+void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod)
+{
+ if (prod == NULL || !prod->is_valid()) {
+ kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!";
+ return;
+ }
kDebug() << "NEW PROD ID: " << prod->get("id");
- m_mltConsumer->set("refresh", 0);
+ m_isBlocked++;
kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track;
mlt_service_lock(m_mltConsumer->get_service());
Mlt::Service service(m_mltProducer->parent().get_service());
if (clipProducer.is_blank()) {
kDebug() << "// ERROR UPDATING CLIP PROD";
mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ m_isBlocked--;
return;
}
Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
// move all effects to the correct producer
- Mlt::Service clipService(clipProducer.get_service());
- Mlt::Service newClipService(clip->get_service());
-
- int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
- while (filter) {
- if (filter->get("kdenlive_ix") != 0) {
- clipService.detach(*filter);
- newClipService.attach(*filter);
- } else ct++;
- filter = clipService.filter(ct);
- }
+ mltPasteEffects(&clipProducer, clip);
trackPlaylist.insert_at(pos, clip, 1);
mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ m_isBlocked--;
}
-bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod) {
- m_isBlocked = true;
+bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod)
+{
+ m_isBlocked++;
- m_mltConsumer->set("refresh", 0);
- mlt_service_lock(m_mltConsumer->get_service());
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
Mlt::Tractor tractor(service);
+ mlt_service_lock(service.get_service());
Mlt::Producer trackProducer(tractor.track(startTrack));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
+ int clipIndex = trackPlaylist.get_clip_index_at(moveStart);
kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex;
bool checkLength = false;
if (endTrack == startTrack) {
- //mlt_service_lock(service.get_service());
Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer.is_blank()) {
// error, destination is not empty
+ if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1);
//int ix = trackPlaylist.get_clip_index_at(moveEnd);
kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
} else {
trackPlaylist.consolidate_blanks(0);
Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service());
if (!destTrackPlaylist.is_blank_at(moveEnd)) {
// error, destination is not empty
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
} else {
Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
// error, destination is not empty
//int ix = trackPlaylist.get_clip_index_at(moveEnd);
kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
}
trackPlaylist.consolidate_blanks(0);
Mlt::Producer *clip;
// check if we are moving a slowmotion producer
QString serv = clipProducer.parent().get("mlt_service");
- if (serv == "framebuffer") {
+ QString currentid = clipProducer.parent().get("id");
+ if (serv == "framebuffer" || currentid.endsWith("_video")) {
clip = &clipProducer;
- } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
+ } else {
+ if (prod == NULL) {
+ // Special case: prod is null when using placeholder clips.
+ // in that case, use the producer existing in playlist. Note that
+ // it will bypass the one producer per track logic and might cause
+ // Sound cracks if clip is moved so that it overlaps another copy of itself
+ clip = clipProducer.cut(clipProducer.get_in(), clipProducer.get_out());
+ } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
+ }
// move all effects to the correct producer
- Mlt::Service clipService(clipProducer.get_service());
- Mlt::Service newClipService(clip->get_service());
-
- int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
- while (filter) {
- if (filter->get("kdenlive_ix") != 0) {
- clipService.detach(*filter);
- newClipService.attach(*filter);
- } else ct++;
- filter = clipService.filter(ct);
- }
+ mltPasteEffects(&clipProducer, clip);
int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1);
destTrackPlaylist.consolidate_blanks(0);
else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true;
}
}
-
+ mlt_service_unlock(service.get_service());
if (checkLength) mltCheckLength();
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
- m_mltConsumer->set("refresh", 1);
+ m_isBlocked--;
+ //askForRefresh();
+ //m_mltConsumer->set("refresh", 1);
return true;
}
-bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) {
+bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut)
+{
int new_in = (int)newIn.frames(m_fps);
int new_out = (int)newOut.frames(m_fps) - 1;
if (new_in >= new_out) return false;
- Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
+ mlt_service serv = m_mltProducer->parent().get_service();
+ m_isBlocked++;
+ mlt_service_lock(serv);
+ //m_mltConsumer->set("refresh", 0);
- mlt_service_lock(service.get_service());
- m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
- mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString mlt_type = mlt_properties_get(properties, "mlt_type");
if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
mlt_transition_set_in_and_out(tr, new_in, new_out);
if (newTrack - startTrack != 0) {
- kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << "x" << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << "x" << newTransitionTrack;
+ //kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << 'x' << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << 'x' << newTransitionTrack;
mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
mlt_properties_set_int(properties, "a_track", newTransitionTrack);
mlt_properties_set_int(properties, "b_track", newTrack);
- //kDebug() << "set new start & end :" << new_in << new_out<< "TR OFFSET: "<<trackOffset<<", TRACKS: "<<mlt_transition_get_a_track(tr)<<"x"<<mlt_transition_get_b_track(tr);
+ //kDebug() << "set new start & end :" << new_in << new_out<< "TR OFFSET: "<<trackOffset<<", TRACKS: "<<mlt_transition_get_a_track(tr)<<'x'<<mlt_transition_get_b_track(tr);
}
break;
}
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
- mlt_service_unlock(service.get_service());
- m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ refresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
return true;
}
-void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) {
- // kDebug() << "update transition" << tag << " at pos " << in.frames(25);
+void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
+{
if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
else {
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
- mltAddTransition(tag, a_track, b_track, in, out, xml);
+ mltAddTransition(tag, a_track, b_track, in, out, xml, false);
}
+ refresh();
//mltSavePlaylist();
}
-void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) {
- m_isBlocked = true;
- Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
-
- //m_mltConsumer->set("refresh", 0);
+void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
+{
mlt_service serv = m_mltProducer->parent().get_service();
+ mlt_service_lock(serv);
+ m_isBlocked++;
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
int currentIn = (int) mlt_transition_get_in(tr);
int currentOut = (int) mlt_transition_get_out(tr);
- // kDebug()<<"Looking for transition : " << currentIn <<"x"<<currentOut<< ", OLD oNE: "<<in_pos<<"x"<<out_pos;
+ // kDebug()<<"Looking for transition : " << currentIn <<'x'<<currentOut<< ", OLD oNE: "<<in_pos<<'x'<<out_pos;
if (resource == type && b_track == currentTrack && currentIn == in_pos && currentOut == out_pos) {
QMap<QString, QString> map = mltGetTransitionParamsFromXml(xml);
QString key;
mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr);
mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").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);
}
char *name = decodedString(key);
char *value = decodedString(it.value());
mlt_properties_set(transproperties, name, value);
- kDebug() << " ------ UPDATING TRANS PARAM: " << name << ": " << value;
+ //kDebug() << " ------ UPDATING TRANS PARAM: " << name << ": " << value;
//filter->set("kdenlive_id", id);
delete[] name;
delete[] value;
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
- m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ //askForRefresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
-void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
- Mlt::Service service(m_mltProducer->parent().get_service());
+void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenTime in, GenTime out, QDomElement /*xml*/, bool /*do_refresh*/)
+{
+ mlt_service serv = m_mltProducer->parent().get_service();
+ m_isBlocked++;
+ mlt_service_lock(serv);
+
+ Mlt::Service service(serv);
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
//if (do_refresh) m_mltConsumer->set("refresh", 0);
- mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString resource = mlt_properties_get(properties, "mlt_service");
const int old_pos = (int)((in + out).frames(m_fps) / 2);
+ kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25);
while (mlt_type == "transition") {
mlt_transition tr = (mlt_transition) nextservice;
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- //if (do_refresh) m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ //askForRefresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
-QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml) {
+QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
+{
QDomNodeList attribs = xml.elementsByTagName("parameter");
QMap<QString, QString> map;
- for (int i = 0;i < attribs.count();i++) {
+ for (int i = 0; i < attribs.count(); i++) {
QDomElement e = attribs.item(i).toElement();
QString name = e.attribute("name");
- //kDebug()<<"-- TRANSITION PARAM: "<<name<<" = "<< e.attribute("name")<<" / " << e.attribute("value");
+ //kDebug()<<"-- TRANSITION PARAM: "<<name<<" = "<< e.attribute("name")<<" / " << e.attribute("value");
map[name] = e.attribute("default");
if (!e.attribute("value").isEmpty()) {
map[name] = e.attribute("value");
//map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
}
- if (e.attribute("namedesc").contains(";")) {
+ if (e.attribute("namedesc").contains(';')) {
QString format = e.attribute("format");
QStringList separators = format.split("%d", QString::SkipEmptyParts);
QStringList values = e.attribute("value").split(QRegExp("[,:;x]"));
if (values.size() > 0)
txtNeu << (int)values[0].toDouble();
int i = 0;
- for (i = 0;i < separators.size() && i + 1 < values.size();i++) {
+ for (i = 0; i < separators.size() && i + 1 < values.size(); i++) {
txtNeu << separators[i];
txtNeu << (int)(values[i+1].toDouble());
}
return map;
}
-void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id) {
+void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id)
+{
kDebug() << "///////// ADDING CLIP TRANSPARENCY AT: " << info.startPos.frames(25);
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
refresh();
}
-void Render::mltDeleteTransparency(int pos, int track, int id) {
+void Render::mltDeleteTransparency(int pos, int track, int id)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
//if (do_refresh) m_mltConsumer->set("refresh", 1);
}
-void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id) {
+void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
mlt_service_lock(service.get_service());
m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
+ m_isBlocked++;
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString mlt_type = mlt_properties_get(properties, "mlt_type");
QString resource = mlt_properties_get(properties, "mlt_service");
- kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << "x" << newEnd << ", " << track << ", " << id;
+ kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << 'x' << newEnd << ", " << track << ", " << id;
while (mlt_type == "transition") {
mlt_transition tr = (mlt_transition) nextservice;
int currentTrack = mlt_transition_get_b_track(tr);
int currentIn = (int) mlt_transition_get_in(tr);
//mlt_properties props = MLT_TRANSITION_PROPERTIES(tr);
int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt();
- kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << "x" << transitionId ;
+ kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << 'x' << transitionId ;
if (resource == "composite" && track == currentTrack && currentIn == oldStart && transitionId == id) {
- kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << "x" << newEnd;
+ kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << 'x' << newEnd;
mlt_transition_set_in_and_out(tr, newStart, newEnd);
break;
}
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
mlt_service_unlock(service.get_service());
- m_mltConsumer->set("refresh", 1);
+ m_isBlocked--;
+ if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
-void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id) {
+void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
mlt_service_lock(service.get_service());
m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
+ m_isBlocked++;
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
int currentOut = (int) mlt_transition_get_out(tr);
//mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt();
- //kDebug()<<" + TRANSITION "<<id<<" == "<<transitionId<<", START TMIE: "<<currentIn<<", LOOK FR: "<<startTime<<", TRACK: "<<currentTrack<<"x"<<startTrack;
+ //kDebug()<<" + TRANSITION "<<id<<" == "<<transitionId<<", START TMIE: "<<currentIn<<", LOOK FR: "<<startTime<<", TRACK: "<<currentTrack<<'x'<<startTrack;
if (resource == "composite" && transitionId == id && startTime == currentIn && startTrack == currentTrack) {
kDebug() << "//////MOVING";
mlt_transition_set_in_and_out(tr, endTime, endTime + currentOut - currentIn);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
+ m_isBlocked--;
mlt_service_unlock(service.get_service());
m_mltConsumer->set("refresh", 1);
}
-bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
+bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh)
+{
if (in >= out) return false;
QMap<QString, QString> args = mltGetTransitionParamsFromXml(xml);
Mlt::Service service(m_mltProducer->parent().get_service());
QString key;
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());
for (it = args.begin(); it != args.end(); ++it) {
key = it.key();
char *name = decodedString(key);
char *value = decodedString(it.value());
- transition->set(name, value);
- kDebug() << " ------ ADDING TRANS PARAM: " << name << ": " << value;
- //filter->set("kdenlive_id", id);
+ if (it.value().isEmpty() == false) transition->set(name, value);
+ //kDebug() << " ------ ADDING TRANS PARAM: " << name << ": " << value;
delete[] name;
delete[] value;
}
// attach filter to the clip
field->plant_transition(*transition, a_track, b_track);
delete[] transId;
- refresh();
+ if (do_refresh) refresh();
return true;
}
-void Render::mltSavePlaylist() {
+void Render::mltSavePlaylist()
+{
kWarning() << "// UPDATING PLAYLIST TO DISK++++++++++++++++";
- Mlt::Consumer fileConsumer(*m_mltProfile, "westley");
- fileConsumer.set("resource", "/tmp/playlist.westley");
+ Mlt::Consumer fileConsumer(*m_mltProfile, "xml");
+ fileConsumer.set("resource", "/tmp/playlist.mlt");
Mlt::Service service(m_mltProducer->get_service());
fileConsumer.start();
}
-QList <Mlt::Producer *> Render::producersList() {
- QList <Mlt::Producer *> prods = QList <Mlt::Producer *> ();
+QList <Mlt::Producer *> Render::producersList()
+{
+ QList <Mlt::Producer *> prods;
+ if (m_mltProducer == NULL) return prods;
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) return prods;
Mlt::Tractor tractor(service);
int trackNb = tractor.count();
for (int t = 1; t < trackNb; t++) {
- Mlt::Producer trackProducer(tractor.track(t));
+ Mlt::Producer *tt = tractor.track(t);
+ Mlt::Producer trackProducer(tt);
+ delete tt;
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipNb = trackPlaylist.count();
//kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb;
for (int i = 0; i < clipNb; i++) {
- Mlt::Producer nprod(trackPlaylist.get_clip(i)->get_parent());
- if (nprod.is_valid() && !nprod.is_blank() && !ids.contains(nprod.get("id"))) {
- ids.append(nprod.get("id"));
- prods.append(&nprod);
+ Mlt::Producer *c = trackPlaylist.get_clip(i);
+ Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
+ if (nprod) {
+ if (!nprod->is_blank() && !ids.contains(nprod->get("id"))) {
+ ids.append(nprod->get("id"));
+ prods.append(nprod);
+ } else delete nprod;
}
+ delete c;
}
}
return prods;
}
-void Render::fillSlowMotionProducers() {
+void Render::fillSlowMotionProducers()
+{
+ if (m_mltProducer == NULL) return;
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) return;
int trackNb = tractor.count();
for (int t = 1; t < trackNb; t++) {
- Mlt::Producer trackProducer(tractor.track(t));
+ Mlt::Producer *tt = tractor.track(t);
+ Mlt::Producer trackProducer(tt);
+ delete tt;
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipNb = trackPlaylist.count();
for (int i = 0; i < clipNb; i++) {
- Mlt::Producer nprod(trackPlaylist.get_clip(i)->get_parent());
- if (nprod.is_valid() && !nprod.is_blank()) {
- QString id = nprod.get("id");
- if (id.startsWith("slowmotion:")) {
+ Mlt::Producer *c = trackPlaylist.get_clip(i);
+ Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
+ if (nprod) {
+ QString id = nprod->get("id");
+ if (id.startsWith("slowmotion:") && !nprod->is_blank()) {
// this is a slowmotion producer, add it to the list
- QString url = nprod.get("resource");
+ QString url = QString::fromUtf8(nprod->get("resource"));
if (!m_slowmotionProducers.contains(url)) {
- m_slowmotionProducers.insert(url, &nprod);
+ m_slowmotionProducers.insert(url, nprod);
}
- }
+ } else delete nprod;
}
+ delete c;
}
}
}
-void Render::mltInsertTrack(int ix, bool videoTrack) {
+void Render::mltInsertTrack(int ix, bool videoTrack)
+{
blockSignals(true);
- m_isBlocked = true;
+ m_isBlocked++;
- m_mltConsumer->set("refresh", 0);
- mlt_service_lock(m_mltConsumer->get_service());
Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
Mlt::Tractor tractor(service);
- Mlt::Playlist playlist;// = new Mlt::Playlist();
+ Mlt::Playlist playlist;
int ct = tractor.count();
- // kDebug() << "// TRACK INSERT: " << ix << ", MAX: " << ct;
+ if (ix > ct) {
+ kDebug() << "// ERROR, TRYING TO insert TRACK " << ix << ", max: " << ct;
+ ix = ct;
+ }
+
int pos = ix;
if (pos < ct) {
Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos));
// Add audio mix transition to last track
Mlt::Field *field = tractor.field();
Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
- //transition->set("mlt_service", "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());
- m_isBlocked = false;
+ //mlt_service_unlock(m_mltConsumer->get_service());
+ mlt_service_unlock(service.get_service());
+ //tractor.multitrack()->refresh();
+ //tractor.refresh();
+ m_isBlocked--;
blockSignals(false);
}
-void Render::mltDeleteTrack(int ix) {
+void Render::mltDeleteTrack(int ix)
+{
QDomDocument doc;
doc.setContent(sceneList(), false);
int tracksCount = doc.elementsByTagName("track").count() - 1;
}
if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) {
tractor.removeChild(transitions.at(i));
- } else if (mappedProps.value("mlt_service") != "mix" && mappedProps.value("b_track").toInt() >= ix) {
+ i--;
+ } else if (mappedProps.value("mlt_service") != "mix" && (mappedProps.value("b_track").toInt() >= ix || mappedProps.value("a_track").toInt() >= ix)) {
// Transition needs to be moved
int a_track = mappedProps.value("a_track").toInt();
int b_track = mappedProps.value("b_track").toInt();
- if (a_track > 0) a_track --;
- if (b_track > 0) b_track --;
+ if (a_track > 0 && a_track >= ix) a_track --;
+ if (b_track > 0 && b_track >= ix) b_track --;
for (int j = 0; j < props.count(); j++) {
QDomElement f = props.at(j).toElement();
if (f.attribute("name") == "a_track") f.firstChild().setNodeValue(QString::number(a_track));
}
}
tractor.removeChild(track);
+ //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
setSceneList(doc.toString(), m_framePosition);
- return;
-
- blockSignals(true);
- m_isBlocked = true;
-
- m_mltConsumer->set("refresh", 0);
- mlt_service_lock(m_mltConsumer->get_service());
- Mlt::Service service(m_mltProducer->parent().get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
-
- /*Mlt::Tractor tractor(service);
-
-
- Mlt::Multitrack *multi = tractor.multitrack();
-
-
- int ct = tractor.count();
- kDebug() << "// TRACK REMOVE: " << ix << ", MAX: " << ct;
- int pos = ix;
- for (; pos < ct ; pos++) {
- Mlt::Service *lastTrack = new Mlt::Service(tractor.track(pos)->get_service());
- //mlt_service_close(lastTrack->get_service());
- delete lastTrack;
- Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos + 1));
- Mlt::Producer *prodToClose = new Mlt::Producer(tractor.track(pos));
- mlt_service_close(prodToMove->get_service());
- mlt_service_close(prodToClose->get_service());
- tractor.set_track(*prodToMove, pos);
- }*/
-
- // Move transitions
- /*mlt_service serv = m_mltProducer->parent().get_service();
- mlt_service nextservice = mlt_service_get_producer(serv);
- mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
- QString mlt_type = mlt_properties_get(properties, "mlt_type");
- QString resource = mlt_properties_get(properties, "mlt_service");
-
- 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);
- }
- }
- nextservice = mlt_service_producer(nextservice);
- if (nextservice == NULL) break;
- properties = MLT_SERVICE_PROPERTIES(nextservice);
- mlt_type = mlt_properties_get(properties, "mlt_type");
- resource = mlt_properties_get(properties, "mlt_service");
- }
-
- // Add audio mix transition to last track
- Mlt::Field *field = tractor.field();
- Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
- //transition->set("mlt_service", "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());
- m_isBlocked = false;
- blockSignals(false);
+ mltCheckLength();
}
-void Render::updatePreviewSettings() {
+void Render::updatePreviewSettings()
+{
kDebug() << "////// RESTARTING CONSUMER";
if (!m_mltConsumer || !m_mltProducer) return;
+ if (m_mltProducer->get_playtime() == 0) return;
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) return;
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
m_mltConsumer->purge();
QString scene = sceneList();
projects / kdenlive / blobdiff