resource = mlt_properties_get(properties, "mlt_service");
}
- int trackNb = tractor.count();
- while (trackNb > 0) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
- trackNb--;
}
}
mlt_service_unlock(service.get_service());
Mlt::Service service(m_mltProducer->get_service());
if (service.type() == tractor_type) {
Mlt::Tractor tractor(service);
- int trackNb = tractor.count();
- while (trackNb > 0) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
trackPlaylist.clear();
- trackNb--;
}
}
return 1;
}
-/** Wraps the VEML command of the same name; Seeks the renderer clip to the given time. */
void Render::seek(GenTime time)
{
if (!m_mltProducer)
if (service.type() != tractor_type || tractor.count() < 2) return;
Mlt::Field *field = tractor.field();
if (doit) {
- int screen = 0;
- for (int i = 1; i < tractor.count() && screen < 4; i++) {
+ for (int i = 1, screen = 0; i < tractor.count() && screen < 4; i++) {
Mlt::Producer trackProducer(tractor.track(i));
kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide");
if (QString(trackProducer.get("hide")).toInt() != 1) {
producer = new Mlt::Producer(*m_mltProfile, 0, tmp);
delete[] tmp;
if (producer && xml.hasAttribute("xmldata")) {
- char *tmp = decodedString(xml.attribute("xmldata"));
+ tmp = decodedString(xml.attribute("xmldata"));
producer->set("xmldata", tmp);
delete[] tmp;
}
metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
producer->seek(0);
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
kDebug() << "REquested fuile info for: " << url.path();
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
// FIXME: should delete this to avoid a leak...
//delete producer;
}
-/** Create the producer from the MLT XML QDomDocument */
#if 0
+/** Create the producer from the MLT XML QDomDocument */
void Render::initSceneList()
{
kDebug() << "-------- INIT SCENE LIST ------_";
}
#endif
-
-
-/** Create the producer from the MLT XML QDomDocument */
int Render::setProducer(Mlt::Producer *producer, int position)
{
if (m_winid == -1) return -1;
if (position != -1) {
m_mltProducer->seek(position);
emit rendererPosition(position);
- }
+ } else emit rendererPosition((int) m_mltProducer->position());
m_isBlocked = false;
return error;
}
-
-
-/** Create the producer from the MLT XML QDomDocument */
int Render::setSceneList(QDomDocument list, int position)
{
return setSceneList(list.toString(), position);
}
-/** Create the producer from the MLT XML QDomDocument */
int Render::setSceneList(QString playlist, int position)
{
if (m_winid == -1) return -1;
resource = mlt_properties_get(properties, "mlt_service");
}
- int trackNb = tractor.count();
- while (trackNb > 0) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
- trackNb--;
}
delete field;
}
//if (position != 0) emit rendererPosition(position);
}
-/** Create the producer from the MLT XML QDomDocument */
const QString Render::sceneList()
{
QString playlist;
return true;
}
-
void Render::saveZone(KUrl url, QString desc, QPoint zone)
{
kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name;
return m_name;
}
-
void Render::emitFrameNumber(double position)
{
+ if (position == m_framePosition) return;
m_framePosition = position;
emit rendererPosition((int) position);
- //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId));
}
void Render::emitConsumerStopped()
}
}
-
-
void Render::exportFileToFirewire(QString /*srcFileName*/, int /*port*/, GenTime /*startTime*/, GenTime /*endTime*/)
{
KMessageBox::sorry(0, i18n("Firewire is not enabled on your system.\n Please install Libiec61883 and recompile Kdenlive"));
}
-
void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
{
if (!m_mltProducer) {
}
#endif
-/** MLT PLAYLIST DIRECT MANIPULATON **/
-
+/*
+ * MLT playlist direct manipulation.
+ */
void Render::mltCheckLength(Mlt::Tractor *tractor)
{
}
}
+Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element)
+{
+ if (element.attribute("speed", "1.0").toDouble() == 1.0 && element.attribute("strobe", "1").toInt() == 1) return prod;
+
+ // We want a slowmotion producer
+ double speed = element.attribute("speed", "1.0").toDouble();
+ int strobe = element.attribute("strobe", "1").toInt();
+ QString url = QString::fromUtf8(prod->get("resource"));
+ url.append('?' + QString::number(speed));
+ if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
+ Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
+ if (!slowprod || slowprod->get_producer() == NULL) {
+ char *tmp = decodedString(url);
+ slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
+ if (strobe > 1) slowprod->set("strobe", strobe);
+ delete[] tmp;
+ QString id = prod->get("id");
+ if (id.contains('_')) id = id.section('_', 0, 0);
+ QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
+ if (strobe > 1) producerid.append(':' + QString::number(strobe));
+ tmp = decodedString(producerid);
+ slowprod->set("id", tmp);
+ delete[] tmp;
+ m_slowmotionProducers.insert(url, slowprod);
+ }
+ return slowprod;
+}
+
int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite, bool push)
{
if (m_mltProducer == NULL) {
int trackDuration = trackProducer.get_playtime() - 1;
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
//kDebug()<<"/// INSERT cLIP: "<<info.cropStart.frames(m_fps)<<", "<<info.startPos.frames(m_fps)<<"-"<<info.endPos.frames(m_fps);
-
- if (element.attribute("speed", "1.0").toDouble() != 1.0 || element.attribute("strobe", "1").toInt() > 1) {
- // We want a slowmotion producer
- double speed = element.attribute("speed", "1.0").toDouble();
- int strobe = element.attribute("strobe", "1").toInt();
- QString url = QString::fromUtf8(prod->get("resource"));
- url.append('?' + QString::number(speed));
- if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
- Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
- if (!slowprod || slowprod->get_producer() == NULL) {
- char *tmp = decodedString(url);
- slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
- if (strobe > 1) slowprod->set("strobe", strobe);
- delete[] tmp;
- QString id = prod->get("id");
- if (id.contains('_')) id = id.section('_', 0, 0);
- QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
- if (strobe > 1) producerid.append(':' + QString::number(strobe));
- tmp = decodedString(producerid);
- slowprod->set("id", tmp);
- delete[] tmp;
- m_slowmotionProducers.insert(url, slowprod);
- }
- prod = slowprod;
- if (prod == NULL || !prod->is_valid()) {
- mlt_service_unlock(service.get_service());
- return -1;
- }
+ prod = checkSlowMotionProducer(prod, element);
+ if (prod == NULL || !prod->is_valid()) {
+ mlt_service_unlock(service.get_service());
+ return -1;
}
+
int cutPos = (int) info.cropStart.frames(m_fps);
+ if (cutPos < 0) cutPos = 0;
int insertPos = (int) info.startPos.frames(m_fps);
int cutDuration = (int)(info.endPos - info.startPos).frames(m_fps) - 1;
Mlt::Producer *clip = prod->cut(cutPos, cutDuration + cutPos);
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int startPos = info.startPos.frames(m_fps);
int clipIndex = trackPlaylist.get_clip_index_at(startPos);
+ if (trackPlaylist.is_blank(clipIndex)) {
+ kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << startPos;
+ return false;
+ }
+ mlt_service_lock(service.get_service());
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
-
// keep effects
QList <Mlt::Filter *> filtersList;
Mlt::Service sourceService(clip->get_service());
ct++;
filter = sourceService.filter(ct);
}
- if (!mltRemoveClip(info.track, info.startPos)) return false;
- if (mltInsertClip(info, element, prod) == -1) return false;
+
+ trackPlaylist.replace_with_blank(clipIndex);
+ delete clip;
+ //if (!mltRemoveClip(info.track, info.startPos)) return false;
+ prod = checkSlowMotionProducer(prod, element);
+ if (prod == NULL || !prod->is_valid()) {
+ mlt_service_unlock(service.get_service());
+ return false;
+ }
+ Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps));
+ trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1);
+ delete clip2;
+
+
+ //if (mltInsertClip(info, element, prod) == -1) return false;
if (!filtersList.isEmpty()) {
clipIndex = trackPlaylist.get_clip_index_at(startPos);
Mlt::Producer *destclip = trackPlaylist.get_clip(clipIndex);
for (int i = 0; i < filtersList.count(); i++)
destService.attach(*(filtersList.at(i)));
}
+ mlt_service_unlock(service.get_service());
return true;
}
resource = mlt_properties_get(properties, "mlt_service");
}
} else {
- int trackNb = tractor.count();
- while (trackNb > 1) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+ for (int trackNb = tractor.count() - 1; trackNb >= 1; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
-
//int clipNb = trackPlaylist.count();
- insertPos = trackClipStartList.value(trackNb - 1);
+ insertPos = trackClipStartList.value(trackNb);
if (insertPos != -1) {
insertPos += offset;
}
trackPlaylist.consolidate_blanks(0);
}
- trackNb--;
}
// now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
QString serv = clipparent.get("mlt_service");
QString id = clipparent.get("id");
+ if (speed <= 0 && speed > -1) speed = 1.0;
//kDebug() << "CLIP SERVICE: " << serv;
if (serv == "avformat" && (speed != 1.0 || strobe > 1)) {
mlt_service_lock(service.get_service());
delete clip;
const int filter_ix = params.paramValue("kdenlive_ix").toInt();
+ const QString region = params.paramValue("region");
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
// create filter
QString tag = params.paramValue("tag");
- kDebug() << " / / INSERTING EFFECT: " << tag;
+ kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
if (tag.startsWith("ladspa")) tag = "ladspa";
char *filterTag = decodedString(tag);
char *filterId = decodedString(params.paramValue("id"));
delete[] starttag;
delete[] endtag;
} else {
- Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
- if (filter && filter->is_valid())
+ Mlt::Filter *filter;
+ QString prefix;
+ if (!region.isEmpty()) {
+ filter = new Mlt::Filter(*m_mltProfile, "region");
+ } else filter = new Mlt::Filter(*m_mltProfile, filterTag);
+ if (filter && filter->is_valid()) {
filter->set("kdenlive_id", filterId);
- else {
+ if (!region.isEmpty()) {
+ char *tmp = decodedString(region);
+ filter->set("resource", tmp);
+ tmp = decodedString(params.paramValue("kdenlive_ix"));
+ filter->set("kdenlive_ix", tmp);
+ filter->set("filter0", filterTag);
+ prefix = "filter0.";
+ delete[] tmp;
+ params.removeParam("id");
+ params.removeParam("region");
+ params.removeParam("kdenlive_ix");
+ }
+ } else {
kDebug() << "filter is NULL";
m_isBlocked = false;
return false;
}
-
params.removeParam("kdenlive_id");
for (int j = 0; j < params.count(); j++) {
- char *name = decodedString(params.at(j).name());
+ char *name = decodedString(prefix + params.at(j).name());
char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
params.removeParam("kdenlive_ix");
params.removeParam("tag");
params.removeParam("disable");
+ params.removeParam("region");
for (int j = 0; j < params.count(); j++) {
effectArgs.append(' ' + params.at(j).value());
QString index = params.paramValue("kdenlive_ix");
QString tag = params.paramValue("tag");
- if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
+ if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
// This is a keyframe effect, to edit it, we remove it and re-add it.
mltRemoveEffect(track, position, index, false);
bool success = mltAddEffect(track, position, params);
delete clip;
m_isBlocked = true;
int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
-
- /*
- kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
+ /* kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
while (filter) {
kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->get("kdenlive_ix");
filter = clipService.filter(ct);
}
kDebug() << "++++++++++++++++++++++++++";
- */
ct = 0;
- filter = clipService.filter(ct);
+ filter = clipService.filter(ct); */
+
+ Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
if (filter->get("kdenlive_ix") == index) {
break;
m_isBlocked = false;
return success;
}
+ QString prefix;
+ QString ser = filter->get("mlt_service");
+ if (ser == "region") prefix = "filter0.";
mlt_service_lock(service.get_service());
for (int j = 0; j < params.count(); j++) {
- char *name = decodedString(params.at(j).name());
+ char *name = decodedString(prefix + params.at(j).name());
char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
return false;
}
int previousStart = clip->get_in();
+ int previousOut = clip->get_out();
delete clip;
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
m_isBlocked = true;
- trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset);
+ trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousOut + frameOffset);
m_isBlocked = false;
mlt_service_unlock(service.get_service());
m_mltConsumer->set("refresh", 1);
mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
- if (clip == NULL) {
+ if (clip == NULL || clip->is_blank()) {
kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!";
mlt_service_unlock(service.get_service());
return false;
}
int previousStart = clip->get_in();
+ int previousOut = clip->get_out();
delete clip;
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
m_isBlocked = true;
- kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
- trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration);
+ previousStart += moveFrame;
+ if (previousStart < 0) {
+ // special case, in point becoming negative (resizing images)
+ previousOut -= previousStart;
+ previousStart = 0;
+ }
+ // kDebug() << "RESIZE, new start: " << previousStart << ", " << previousOut;
+ trackPlaylist.resize_clip(clipIndex, previousStart, previousOut);
if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
else {
//int midpos = info.startPos.frames(m_fps) + moveFrame - 1;
int blankIndex = clipIndex - 1;
int blankLength = trackPlaylist.clip_length(blankIndex);
- kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame;
+ // kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame;
if (! trackPlaylist.is_blank(blankIndex)) {
kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK";
}
kWarning() << "// TRACTOR PROBLEM";
return false;
}
- mlt_service_lock(m_mltConsumer->get_service());
-
+ mlt_service_lock(service.get_service());
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (clipProducer == NULL || clipProducer->is_blank()) {
kDebug() << "// ERROR UPDATING CLIP PROD";
delete clipProducer;
- mlt_service_unlock(m_mltConsumer->get_service());
+ mlt_service_unlock(service.get_service());
m_isBlocked--;
return false;
}
Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out());
- if (!clip) return false;
+ if (!clip || !clip->is_valid()) {
+ if (clip) delete clip;
+ delete clipProducer;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
+ return false;
+ }
// move all effects to the correct producer
mltPasteEffects(clipProducer, clip);
trackPlaylist.insert_at(pos, clip, 1);
delete clip;
delete clipProducer;
- mlt_service_unlock(m_mltConsumer->get_service());
+ mlt_service_unlock(service.get_service());
m_isBlocked--;
return true;
}
bool checkLength = false;
if (endTrack == startTrack) {
Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
- if (!overwrite && (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || clipProducer->is_blank())) {
+ if ((!overwrite && !trackPlaylist.is_blank_at(moveEnd)) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
// error, destination is not empty
- if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1);
- if (clipProducer) delete clipProducer;
+ if (clipProducer) {
+ if (!trackPlaylist.is_blank_at(moveEnd) && clipProducer->is_valid()) trackPlaylist.insert_at(moveStart, clipProducer, 1);
+ delete clipProducer;
+ }
//int ix = trackPlaylist.get_clip_index_at(moveEnd);
kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
mlt_service_unlock(service.get_service());
int a_track = mappedProps.value("a_track").toInt();
int b_track = mappedProps.value("b_track").toInt();
if (a_track > 0 && a_track >= ix) a_track --;
- if (b_track > 0 && b_track > ix) b_track --;
if (b_track == ix) {
// transition was on the deleted track, so remove it
tractor.removeChild(transitions.at(i));
i--;
continue;
}
+ 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));
projects / kdenlive / blobdiff