char *tmp;
tmp = decodedString(KdenliveSettings::current_profile());
m_mltProfile = new Mlt::Profile(tmp);
+ setenv("MLT_PROFILE", tmp, 1);
delete[] tmp;
kDebug() << "reset to same profile, nothing to do";
return 1;
}
+ kDebug() << "// RESETTING PROFILE FROM: " << currentProfile << " TO: " << KdenliveSettings::current_profile();
if (m_isSplitView) slotSplitView(false);
if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
m_mltConsumer->purge();
delete m_mltConsumer;
m_mltConsumer = NULL;
QString scene = sceneList();
- if (m_mltProducer) delete m_mltProducer;
+ int pos = 0;
+ if (m_mltProducer) {
+ pos = m_mltProducer->position();
+ delete m_mltProducer;
+ }
m_mltProducer = NULL;
if (m_mltProfile) delete m_mltProfile;
m_mltProfile = NULL;
buildConsumer();
//kDebug() << "//RESET WITHSCENE: " << scene;
- setSceneList(scene);
+ setSceneList(scene, pos);
char *tmp = decodedString(scene);
Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
// Retrieve audio / video codec name
- // If there is a
+ // If there is a
char property[200];
if (producer->get_int("video_index") > -1) {
/*if (context->duration == AV_NOPTS_VALUE) {
}
m_isBlocked = false;
blockSignals(false);
- emit rendererPosition(position);
+ //kDebug()<<"// SETSCN LST, POS: "<<position;
+ //if (position != 0) emit rendererPosition(position);
}
/** Create the producer from the Westley QDomDocument */
/** MLT PLAYLIST DIRECT MANIPULATON **/
-void Render::mltCheckLength(bool reload) {
+void Render::mltCheckLength() {
//kDebug()<<"checking track length: "<<track<<"..........";
Mlt::Service service(m_mltProducer->get_service());
return true;
}
-int Render::mltGetSpaceLength(const GenTime pos, int track) {
+int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) {
if (!m_mltProducer) {
kDebug() << "PLAYLIST NOT INITIALISED //////";
return -1;
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
if (!trackPlaylist.is_blank(clipIndex)) return -1;
- return trackPlaylist.clip_length(clipIndex);
+ if (fromBlankStart) return trackPlaylist.clip_length(clipIndex);
+ return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos;
}
-void Render::mltInsertSpace(const GenTime pos, int track, const GenTime duration) {
+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 //////";
return;
kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return;
}
+ //kDebug()<<"// CLP STRT LST: "<<trackClipStartList;
+ //kDebug()<<"// TRA STRT LST: "<<trackTransitionStartList;
Mlt::Service service(parentProd.get_service());
Mlt::Tractor tractor(service);
mlt_service_lock(service.get_service());
- int insertPos = pos.frames(m_fps);
int diff = duration.frames(m_fps);
+ int offset = timeOffset.frames(m_fps);
+ int insertPos;
if (track != -1) {
// insert space in one track only
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
- else {
- int position = trackPlaylist.clip_start(clipIndex);
- trackPlaylist.remove_region(position + diff, -diff - 1);
+ insertPos = trackClipStartList.value(track);
+ if (insertPos != -1) {
+ insertPos += offset;
+ int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
+ if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
+ else {
+ if (!trackPlaylist.is_blank(clipIndex)) clipIndex --;
+ if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos;
+ int position = trackPlaylist.clip_start(clipIndex);
+ trackPlaylist.remove_region(position, - diff - 1);
+ }
+ trackPlaylist.consolidate_blanks(0);
}
- trackPlaylist.consolidate_blanks(0);
-
// now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
int currentTrack = mlt_transition_get_b_track(tr);
int currentIn = (int) mlt_transition_get_in(tr);
int currentOut = (int) mlt_transition_get_out(tr);
-
- if (track == currentTrack && currentOut > insertPos && resource != "mix") {
- mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ insertPos = trackTransitionStartList.value(track);
+ if (insertPos != -1) {
+ insertPos += offset;
+ if (track == currentTrack && currentOut > insertPos && resource != "mix") {
+ mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ }
}
nextservice = mlt_service_producer(nextservice);
if (nextservice == NULL) break;
while (trackNb > 1) {
Mlt::Producer trackProducer(tractor.track(trackNb - 1));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
- else {
- int position = trackPlaylist.clip_start(clipIndex);
- trackPlaylist.remove_region(position + diff, -diff - 1);
+
+
+ int clipNb = trackPlaylist.count();
+ insertPos = trackClipStartList.value(trackNb - 1);
+ if (insertPos != -1) {
+ insertPos += offset;
+
+ /* kDebug()<<"-------------\nTRACK "<<trackNb<<" HAS "<<clipNb<<" CLPIS";
+ kDebug() << "INSERT SPACE AT: "<<insertPos<<", DIFF: "<<diff<<", TK: "<<trackNb;
+ for (int i = 0; i < clipNb; i++) {
+ kDebug()<<"CLIP "<<i<<", START: "<<trackPlaylist.clip_start(i)<<", END: "<<trackPlaylist.clip_start(i) + trackPlaylist.clip_length(i);
+ if (trackPlaylist.is_blank(i)) kDebug()<<"++ BLANK ++ ";
+ kDebug()<<"-------------";
+ }
+ kDebug()<<"END-------------";*/
+
+
+ int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
+ if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
+ else {
+ if (!trackPlaylist.is_blank(clipIndex)) clipIndex --;
+ if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos;
+ int position = trackPlaylist.clip_start(clipIndex);
+ trackPlaylist.remove_region(position, - diff - 1);
+ }
+ trackPlaylist.consolidate_blanks(0);
}
- trackPlaylist.consolidate_blanks(0);
trackNb--;
}
// now move transitions
mlt_transition tr = (mlt_transition) nextservice;
int currentIn = (int) mlt_transition_get_in(tr);
int currentOut = (int) mlt_transition_get_out(tr);
-
- if (currentOut > insertPos && resource != "mix") {
- mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ int currentTrack = mlt_transition_get_b_track(tr);
+ insertPos = trackTransitionStartList.value(currentTrack);
+ if (insertPos != -1) {
+ insertPos += offset;
+ if (currentOut > insertPos && resource != "mix") {
+ mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ }
}
nextservice = mlt_service_producer(nextservice);
if (nextservice == NULL) break;
}
mlt_service_unlock(service.get_service());
mltCheckLength();
+ m_mltConsumer->set("refresh", 1);
}
int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod) {
if ((index == "-1" && 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 ct++;
+ } else {
+ if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
+ ct++;
+ }
filter = clipService.filter(ct);
}
m_isBlocked = false;
}
-bool Render::mltAddEffect(int track, GenTime position, QHash <QString, QString> args, bool doRefresh) {
+bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh) {
Mlt::Service service(m_mltProducer->parent().get_service());
// temporarily remove all effects after insert point
QList <Mlt::Filter *> filtersList;
- const int filter_ix = QString(args.value("kdenlive_ix")).toInt();
+ const int filter_ix = params.paramValue("kdenlive_ix").toInt();
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
}
// create filter
- QString tag = args.value("tag");
+ QString tag = params.paramValue("tag");
kDebug() << " / / INSERTING EFFECT: " << tag;
if (tag.startsWith("ladspa")) tag = "ladspa";
char *filterTag = decodedString(tag);
- char *filterId = decodedString(args.value("id"));
+ char *filterId = decodedString(params.paramValue("id"));
QHash<QString, QString>::Iterator it;
- QString kfr = args.value("keyframes");
+ QString kfr = params.paramValue("keyframes");
if (!kfr.isEmpty()) {
QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts);
- kDebug() << "// ADDING KEYFRAME EFFECT: " << args.value("keyframes");
- char *starttag = decodedString(args.value("starttag", "start"));
- char *endtag = decodedString(args.value("endtag", "end"));
+ 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 = args.value("max").toDouble();
- double min = args.value("min").toDouble();
- double factor = args.value("factor", "1").toDouble();
- args.remove("starttag");
- args.remove("endtag");
- args.remove("keyframes");
- args.remove("min");
- args.remove("max");
- args.remove("factor");
+ double max = params.paramValue("max").toDouble();
+ double min = params.paramValue("min").toDouble();
+ double factor = params.paramValue("factor", "1").toDouble();
+ params.removeParam("starttag");
+ params.removeParam("endtag");
+ params.removeParam("keyframes");
+ params.removeParam("min");
+ params.removeParam("max");
+ params.removeParam("factor");
int offset = 0;
for (int i = 0; i < keyFrames.size() - 1; ++i) {
Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
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 (it = args.begin(); it != args.end(); ++it) {
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
+
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(params.at(j).name());
+ char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
delete[] value;
return false;
}
- for (it = args.begin(); it != args.end(); ++it) {
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
+ params.removeParam("kdenlive_id");
+
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(params.at(j).name());
+ char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
delete[] value;
}
+
+ if (tag == "sox") {
+ QString effectArgs = params.paramValue("id").section('_', 1);
+
+ params.removeParam("id");
+ params.removeParam("kdenlive_ix");
+ params.removeParam("tag");
+ params.removeParam("disabled");
+
+ for (int j = 0; j < params.count(); j++) {
+ effectArgs.append(' ' + params.at(j).value());
+ }
+ //kDebug() << "SOX EFFECTS: " << effectArgs.simplified();
+ char *value = decodedString(effectArgs.simplified());
+ filter->set("effect", value);
+ delete[] value;
+ }
+
+
// attach filter to the clip
clipService.attach(*filter);
}
return true;
}
-bool Render::mltEditEffect(int track, GenTime position, QHash <QString, QString> args) {
- QString index = args.value("kdenlive_ix");
- QString tag = args.value("tag");
- QHash<QString, QString>::Iterator it = args.begin();
- if (!args.value("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
+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);
- bool success = mltAddEffect(track, position, args);
+ bool success = mltAddEffect(track, position, params);
return success;
}
} else ct++;
filter = clipService.filter(ct);
}
- bool success = mltAddEffect(track, position, args);
+ bool success = mltAddEffect(track, position, params);
for (int i = 0; i < filtersList.count(); i++) {
clipService.attach(*(filtersList.at(i)));
return success;
}
- for (it = args.begin(); it != args.end(); ++it) {
- kDebug() << " / / EDITING EFFECT ARGS: " << it.key() << ": " << it.value();
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(params.at(j).name());
+ char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
delete[] value;
}
+
m_isBlocked = false;
refresh();
return true;
mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
}*/
m_isBlocked = false;
+ m_mltConsumer->set("refresh", 1);
return true;
}
m_isBlocked = false;
//m_mltConsumer->set("refresh", 1);
mlt_service_unlock(service.get_service());
+ m_mltConsumer->set("refresh", 1);
return true;
}
projects / kdenlive / blobdiff