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 ?
+ // 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) :
+Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) :
QObject(parent),
m_isBlocked(true),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
- m_mltTextProducer(NULL),
m_framePosition(0),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
m_blackClip(NULL),
- m_winid(winid),
- m_externalwinid(extid)
+ m_winid(winid)
{
- kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
- refreshTimer = new QTimer(this);
- connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
+ 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();
void Render::closeMlt()
{
- delete osdTimer;
- delete refreshTimer;
+ delete m_osdTimer;
+ delete m_refreshTimer;
delete m_mltConsumer;
delete m_mltProducer;
delete m_blackClip;
}
QString audioDriver = KdenliveSettings::audiodrivername();
+ if (audioDriver.isEmpty())
+ audioDriver = KdenliveSettings::autoaudiodrivername();
if (!audioDriver.isEmpty()) {
tmp = decodedString(audioDriver);
m_mltConsumer->set("audio_driver", tmp);
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");
if (width == -1) {
width = renderWidth();
height = renderHeight();
- }
+ } else if (width % 2 == 1) width++;
QPixmap pix(width, height);
if (!m_mltProducer) {
pix.fill(Qt::black);
}
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 {
char *tmp = decodedString(url.path());
if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
- emit removeInvalidClip(clipId);
+ emit removeInvalidClip(clipId, replaceProducer);
delete producer;
return;
}
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)
}
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");
}
}
-/** Create the producer from the Westley QDomDocument */
+/** Create the producer from the MLT XML QDomDocument */
#if 0
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 */
+/** Create the producer from the MLT XML QDomDocument */
void Render::setProducer(Mlt::Producer *producer, int position)
{
if (m_winid == -1) return;
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();
-/** Create the producer from the Westley QDomDocument */
+/** Create the producer from the MLT XML QDomDocument */
void Render::setSceneList(QDomDocument list, int position)
{
setSceneList(list.toString(), position);
}
-/** Create the producer from the Westley QDomDocument */
+/** Create the producer from the MLT XML QDomDocument */
void Render::setSceneList(QString playlist, int position)
{
if (m_winid == -1) return;
//kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
- if (m_mltConsumer) {
- m_mltConsumer->stop();
- //m_mltConsumer->set("refresh", 0);
- } else {
+ if (m_mltConsumer == NULL) {
+ kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER";
m_isBlocked = false;
return;
}
+ if (!m_mltConsumer->is_stopped()) {
+ m_mltConsumer->stop();
+ //m_mltConsumer->set("refresh", 0);
+ }
+
if (m_mltProducer) {
m_mltProducer->set_speed(0);
//if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
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();
+ connectPlaylist();
+ fillSlowMotionProducers();
+
m_isBlocked = false;
blockSignals(false);
emit refreshDocumentProducers();
//if (position != 0) emit rendererPosition(position);
}
-/** Create the producer from the Westley QDomDocument */
+/** 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;
}
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;
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();
}
double Render::fps() const
if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
}*/
refresh();
- osdTimer->setSingleShot(2500);
+ m_osdTimer->setSingleShot(2500);
}
void Render::slotOsdTimeout()
void Render::askForRefresh()
{
// Use a Timer so that we don't refresh too much
- refreshTimer->start(200);
+ m_refreshTimer->start(200);
}
void Render::doRefresh()
{
if (!m_mltProducer || m_isBlocked)
return;
- refreshTimer->stop();
+ m_refreshTimer->stop();
if (m_mltConsumer) {
m_mltConsumer->set("refresh", 1);
}
}
Mlt::Producer blackTrackProducer(tractor.track(0));
- int blackDuration = blackTrackProducer.get_playtime() - 1;
- if (blackDuration != duration) {
+ if (blackTrackProducer.get_playtime() - 1 != duration) {
Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
- blackTrackPlaylist.clear();
- int dur = duration;
- while (dur > 14000) {
- blackTrackPlaylist.append(*m_blackClip, 0, 13999);
- dur = dur - 14000;
- }
- if (dur > 0) {
- blackTrackPlaylist.append(*m_blackClip, 0, dur);
+ 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(duration);
}
void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod)
{
- if (!m_mltProducer) {
- kDebug() << "PLAYLIST NOT INITIALISED //////";
+ 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;
}
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (filter->is_valid() && strcmp(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"));
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;
}
int Render::mltTrackDuration(int track)
{
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;
}
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);
}
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);
if (clipService.detach(*filter) == 0) success = true;
kDebug() << " / / / DLEETED EFFECT: " << ct;
} else if (updateIndex) {
- // Adjust the other effects index
+ // 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++;
//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;
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());
return false;
}
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);
+ }
trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart);
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 << ", IX: " << clipIndex << ", MAX: " << trackPlaylist.count();
+ //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 (clipIndex < trackPlaylist.count()) {
- // If this is not the last clip in playlist
+ // 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 (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);
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");
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 *value = decodedString(it.value());
if (it.value().isEmpty() == false) transition->set(name, value);
//kDebug() << " ------ ADDING TRANS PARAM: " << name << ": " << value;
- //filter->set("kdenlive_id", id);
delete[] name;
delete[] value;
}
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());
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));
projects / kdenlive / blobdiff