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) {
}
-/** 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;
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)
{
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);
bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
{
- //kDebug() << "//////// RSIZING CLIP from: "<<info.startPos.frames(25)<<" to "<<diff.frames(25);
+ // 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::Tractor tractor(service);
}
mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
- if (trackPlaylist.is_blank(clipIndex)) {
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+ if (clip == NULL || clip->is_blank()) {
kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!";
mlt_service_unlock(service.get_service());
return false;
}
- int previousStart = trackPlaylist.clip_start(clipIndex);
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
+ int previousStart = clip->get_in();
+ int previousOut = clip->get_out();
+ delete clip;
m_isBlocked = true;
- kDebug() << "RESIZE, old start: " << previousStart + moveFrame << ", " << previousStart + previousDuration;
- trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration);
+ //kDebug() << "RESIZE, old start: " << previousStart + moveFrame << ", " << previousStart + previousOut;
+ trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousOut);
if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
else {
//int midpos = info.startPos.frames(m_fps) + moveFrame - 1;
projects / kdenlive / blobdiff