delete m_mltConsumer;
if (m_mltProducer)
delete m_mltProducer;
+ while (! m_producersList.isEmpty()) delete m_producersList.takeFirst();
//delete m_osdInfo;
}
Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
delete[] tmp;
m_mltProducer = producer;
+ m_mltProducer->optimise();
m_mltProducer->set_speed(0);
connectPlaylist();
QMap < QString, QString > metadataPropertyMap;
KUrl url = KUrl(xml.attribute("resource", QString::null));
+ bool newProducer = false;
+
+ Mlt::Producer *producer = getProducerById(QString::number(clipId));
+ if (producer == NULL) {
+ if (url.isEmpty()) {
+ QDomDocument doc;
+ QDomElement westley = doc.createElement("westley");
+ QDomElement play = doc.createElement("playlist");
+ doc.appendChild(westley);
+ westley.appendChild(play);
+ play.appendChild(doc.importNode(xml, true));
+ char *tmp = decodedString(doc.toString());
+ producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
+ delete[] tmp;
+ } else {
+ char *tmp = decodedString(url.path());
+ producer = new Mlt::Producer(*m_mltProfile, tmp);
+ delete[] tmp;
+ }
- Mlt::Producer *producer;
-
- if (url.isEmpty()) {
- QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
- QDomElement play = doc.createElement("playlist");
- doc.appendChild(westley);
- westley.appendChild(play);
- play.appendChild(doc.importNode(xml, true));
- char *tmp = decodedString(doc.toString());
- producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
- delete[] tmp;
- } else {
- char *tmp = decodedString(url.path());
- producer = new Mlt::Producer(*m_mltProfile, tmp);
- delete[] tmp;
+ if (producer->is_blank()) {
+ kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: ";
+ return;
+ }
+ m_producersList.append(producer);
+ newProducer = true;
}
- if (producer->is_blank()) {
- kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: ";
- return;
- }
+
int frameNumber = xml.attribute("thumbnail", "0").toInt();
if (frameNumber != 0) producer->seek(frameNumber);
emit replyGetFileProperties(clipId, filePropertyMap, metadataPropertyMap);
kDebug() << "REquested fuile info for: " << url.path();
if (frame) delete frame;
- if (producer) delete producer;
+ if (!newProducer && producer) delete producer;
}
/** Create the producer from the Westley QDomDocument */
m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
delete[] tmp;
if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
- //m_mltProducer->optimise();
+ m_mltProducer->optimise();
/*if (KdenliveSettings::osdtimecode()) {
// Attach filter for on screen display of timecode
char *tmppath = decodedString("westley:" + path);
Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath);
+ m_mltProducer->optimise();
delete[] tmppath;
westleyConsumer.set("terminate_on_pause", 1);
Mlt::Producer prod(m_mltProducer->get_producer());
m_mltConsumer->connect(*m_mltProducer);
m_mltProducer->set_speed(0);
m_mltConsumer->start();
+ parsePlaylistForClips();
emit durationChanged(m_mltProducer->get_playtime());
//refresh();
/*
black.setAttribute("mlt_service", "colour");
black.setAttribute("colour", "black");
black.setAttribute("id", "black");
- black.setAttribute("in", "0");
- black.setAttribute("out", "13999");
+ ItemInfo info;
+ info.track = 0;
while (dur > 14000) {
- mltInsertClip(0, GenTime(i * 14000, m_fps), GenTime(), black);
+ info.startPos = GenTime(i * 14000, m_fps);
+ info.endPos = info.startPos + GenTime(13999, m_fps);
+ mltInsertClip(info, black);
dur = dur - 14000;
i++;
}
if (dur > 0) {
- black.setAttribute("out", QString::number(dur));
- mltInsertClip(0, GenTime(i * 14000, m_fps), GenTime(), black);
+ info.startPos = GenTime(i * 14000, m_fps);
+ info.endPos = info.startPos + GenTime(dur, m_fps);
+ mltInsertClip(info, black);
}
m_mltProducer->set("out", duration);
emit durationChanged((int)duration);
}
}
-void Render::mltInsertClip(int track, GenTime position, GenTime crop, QDomElement element) {
+void Render::mltInsertClip(ItemInfo info, QDomElement element) {
if (!m_mltProducer) {
kDebug() << "PLAYLIST NOT INITIALISED //////";
return;
Mlt::Service service(parentProd.get_service());
Mlt::Tractor tractor(service);
mlt_service_lock(service.get_service());
- Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- QDomDocument doc;
- doc.appendChild(doc.importNode(element, true));
- QString resource = doc.toString();
- char *tmp = decodedString(resource);
- Mlt::Producer clip(*m_mltProfile, "westley-xml", tmp);
- clip.set("in", crop.frames(m_fps));
- //clip.set_in_and_out(in.frames(m_fps), out.frames(m_fps));
- delete[] tmp;
- trackPlaylist.insert_at((int) position.frames(m_fps), clip, 1);
+ Mlt::Producer *prod = getProducerById(element.attribute("id"));
+ if (prod == NULL) {
+ // clip was never used yet
+ QDomDocument doc;
+ doc.appendChild(doc.importNode(element, true));
+ QString resource = doc.toString();
+ kDebug() << "// INSERTING CLIP: " << resource;
+ char *tmp = decodedString(resource);
+ prod = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
+ delete[] tmp;
+ m_producersList.append(prod);
+ }
+
+ Mlt::Producer *clip = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps));
+ trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1);
+
mlt_service_unlock(service.get_service());
- if (track != 0) mltCheckLength();
+
+ if (info.track != 0) mltCheckLength();
//tractor.multitrack()->refresh();
//tractor.refresh();
}
+Mlt::Producer *Render::getProducerById(const QString &id) {
+ for (int i = 0; i < m_producersList.count(); i++) {
+ if (m_producersList.at(i)->get("id") == id) return m_producersList.at(i);
+ }
+ return NULL;
+}
+
+void Render::parsePlaylistForClips() {
+ // clear current producers list
+ while (! m_producersList.isEmpty()) delete m_producersList.takeFirst();
+
+ //parse entire playlists to find all the different clips
+ Mlt::Producer parentProd(m_mltProducer->parent());
+ if (parentProd.get_producer() == NULL) {
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ return;
+ }
+ Mlt::Service service(parentProd.get_service());
+ if (service.type() != tractor_type) return;
+ Mlt::Tractor tractor(service);
+ mlt_service_lock(service.get_service());
+ for (int i = 0; i < tractor.count(); i++) {
+ Mlt::Producer trackProducer(tractor.track(i));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ for (int j = 0; j < trackPlaylist.count(); j++) {
+ if (!trackPlaylist.is_blank(j)) {
+ Mlt::Producer *clip = trackPlaylist.get_clip(j);
+ if (clip) {
+ if (getProducerById(clip->get("id")) == NULL)
+ m_producersList.append(new Mlt::Producer(clip->get_parent()));
+ }
+ }
+ }
+ }
+}
+
void Render::mltCutClip(int track, GenTime position) {
m_isBlocked = true;
m_isBlocked = false;
}
-void Render::mltUpdateClip(int track, GenTime position, GenTime crop, QDomElement element) {
+void Render::mltUpdateClip(ItemInfo info, QDomElement element) {
// TODO: optimize
- mltRemoveClip(track, position);
- mltInsertClip(track, position, crop, element);
+ mltRemoveClip(info.track, info.startPos);
+ mltInsertClip(info, element);
}
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
mltAddTransition(tag, a_track, b_track, in, out, xml);
}
- mltSavePlaylist();
+ //mltSavePlaylist();
}
void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) {
projects / kdenlive / blobdiff