X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Frenderer.cpp;h=affbff833fb4770f008cbe7712f7dae0cbfcb030;hb=6e140f856eeee8a9fd21797b711e93c0846d88fe;hp=110f4122c6fa6713b054e7b6905e19e4e048edb2;hpb=05d5da65489ab125958e4f62ded8987bcf4989aa;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 110f4122..affbff83 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -55,7 +55,7 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) : QObject(parent), - m_isBlocked(true), + m_isBlocked(0), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), @@ -66,7 +66,7 @@ Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget m_blackClip(NULL), m_winid(winid) { - kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); + kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); m_refreshTimer = new QTimer(this); connect(m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); @@ -84,6 +84,7 @@ Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget Render::~Render() { + m_isBlocked = 1; closeMlt(); } @@ -148,6 +149,8 @@ void Render::buildConsumer() } QString audioDriver = KdenliveSettings::audiodrivername(); + if (audioDriver.isEmpty()) + audioDriver = KdenliveSettings::autoaudiodrivername(); if (!audioDriver.isEmpty()) { tmp = decodedString(audioDriver); m_mltConsumer->set("audio_driver", tmp); @@ -195,7 +198,7 @@ int Render::resetProfile() 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"); @@ -221,7 +224,7 @@ void Render::seek(GenTime time) { if (!m_mltProducer) return; - m_isBlocked = false; + m_isBlocked = 0; m_mltProducer->seek((int)(time.frames(m_fps))); refresh(); } @@ -269,7 +272,7 @@ QPixmap Render::extractFrame(int frame_position, int width, int height) if (width == -1) { width = renderWidth(); height = renderHeight(); - } + } else if (width % 2 == 1) width++; QPixmap pix(width, height); if (!m_mltProducer) { pix.fill(Qt::black); @@ -499,17 +502,17 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo } 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()); @@ -593,7 +596,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo 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) @@ -670,11 +673,11 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo } 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"); } @@ -714,14 +717,14 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo } -/** 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"); @@ -744,17 +747,17 @@ void Render::initSceneList() QDomElement playlist5 = doc.createElement("playlist"); multitrack.appendChild(playlist5); tractor.appendChild(multitrack); - westley.appendChild(tractor); + mlt.appendChild(tractor); // kDebug()<");*/ + QString tmp = QString("");*/ 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; @@ -779,7 +782,7 @@ void Render::setProducer(Mlt::Producer *producer, int position) 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(); @@ -792,13 +795,13 @@ void Render::setProducer(Mlt::Producer *producer, int position) -/** 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; @@ -808,14 +811,17 @@ void Render::setSceneList(QString playlist, int position) //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); @@ -827,7 +833,7 @@ void Render::setSceneList(QString playlist, int position) blockSignals(true); char *tmp = decodedString(playlist); - m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); + m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp); if (!m_mltProducer || !m_mltProducer->is_valid()) { kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp; @@ -842,7 +848,7 @@ void Render::setSceneList(QString playlist, int position) 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 ); @@ -861,14 +867,15 @@ void Render::setSceneList(QString playlist, int position) }*/ 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(); @@ -876,20 +883,20 @@ void Render::setSceneList(QString playlist, int position) //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; } @@ -901,8 +908,8 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData) 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; @@ -921,11 +928,11 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData) 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); @@ -933,7 +940,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) 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 @@ -945,10 +952,10 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) 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 @@ -1215,7 +1222,7 @@ void Render::seekToFrame(int pos) void Render::askForRefresh() { // Use a Timer so that we don't refresh too much - m_refreshTimer->start(200); + m_refreshTimer->start(300); } void Render::doRefresh() @@ -1234,6 +1241,17 @@ void Render::refresh() } } +void Render::setDropFrames(bool show) +{ + if (m_mltConsumer) { + int dropFrames = 1; + if (show == false) dropFrames = 0; + m_mltConsumer->stop(); + m_mltConsumer->set("play.real_time", dropFrames); + m_mltConsumer->start(); + } +} + double Render::playSpeed() { if (m_mltProducer) return m_mltProducer->get_speed(); @@ -1337,19 +1355,19 @@ void Render::mltCheckLength() } 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); } @@ -1357,18 +1375,22 @@ void Render::mltCheckLength() 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; } Mlt::Service service(parentProd.get_service()); Mlt::Tractor tractor(service); + if (info.track > tractor.count() - 1) { + kDebug() << "ERROR TRYING TO INSERT CLIP ON TRACK " << info.track << ", at POS: " << info.startPos.frames(25); + return; + } mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -1501,6 +1523,7 @@ bool Render::mltRemoveClip(int track, GenTime position) if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; Mlt::Tractor tractor(service); + mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); @@ -1514,13 +1537,11 @@ bool Render::mltRemoveClip(int track, GenTime position) if (trackPlaylist.is_blank(i)) blk = "(blank)"; kDebug()<<"CLIP "<parent()); if (parentProd.get_producer() == NULL) { - kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; + kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; return -1; } @@ -1568,12 +1589,12 @@ int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) 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; } @@ -1587,12 +1608,12 @@ int Render::mltTrackDuration(int track) void Render::mltInsertSpace(QMap trackClipStartList, QMap 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, QMap } 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); @@ -1681,7 +1702,7 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap } 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); @@ -1726,16 +1747,22 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt int clipIndex = trackPlaylist.get_clip_index_at(startPos); int clipLength = trackPlaylist.clip_length(clipIndex); - Mlt::Producer clip(trackPlaylist.get_clip(clipIndex)); - if (!clip.is_valid() || clip.is_blank()) { + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + if (clip == NULL) { + return -1; + } + if (!clip->is_valid() || clip->is_blank()) { // invalid clip + delete clip; return -1; } - Mlt::Producer clipparent = clip.parent(); + Mlt::Producer clipparent = clip->parent(); if (!clipparent.is_valid() || clipparent.is_blank()) { // invalid clip + delete clip; return -1; } + delete clip; QString serv = clipparent.get("mlt_service"); QString id = clipparent.get("id"); //kDebug() << "CLIP SERVICE: " << serv; @@ -1857,7 +1884,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up 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++; @@ -2028,7 +2055,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par //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()); @@ -2045,7 +2072,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par 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 filtersList; @@ -2082,7 +2109,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par 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); @@ -2091,7 +2118,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) //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()); @@ -2154,9 +2181,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) { m_isBlocked = true; - Mlt::Service service(m_mltProducer->parent().get_service()); - Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -2176,22 +2201,31 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) m_isBlocked = false; return false; } + mlt_service_lock(service.get_service()); 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); + } + if (newDuration > clip->get_out()) { + clip->parent().set_in_and_out(0, newDuration + 1); + clip->set_in_and_out(0, newDuration + 1); + } + delete clip; 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; @@ -2204,9 +2238,8 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) } } } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); - trackPlaylist.consolidate_blanks(0); - + mlt_service_unlock(service.get_service()); if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(); /*if (QString(clip->parent().get("transparency")).toInt() == 1) { @@ -2263,6 +2296,7 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) return false; } int previousStart = clip->get_in(); + delete clip; int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; m_isBlocked = true; trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset); @@ -2293,6 +2327,7 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) return false; } int previousStart = clip->get_in(); + delete clip; int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; m_isBlocked = true; kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame; @@ -2339,7 +2374,7 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) return; } kDebug() << "NEW PROD ID: " << prod->get("id"); - m_mltConsumer->set("refresh", 0); + m_isBlocked++; kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; mlt_service_lock(m_mltConsumer->get_service()); Mlt::Service service(m_mltProducer->parent().get_service()); @@ -2353,7 +2388,7 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) if (clipProducer.is_blank()) { kDebug() << "// ERROR UPDATING CLIP PROD"; mlt_service_unlock(m_mltConsumer->get_service()); - m_isBlocked = false; + m_isBlocked--; return; } Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out()); @@ -2374,19 +2409,18 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) trackPlaylist.insert_at(pos, clip, 1); mlt_service_unlock(m_mltConsumer->get_service()); - m_isBlocked = false; + m_isBlocked--; } bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod) { - m_isBlocked = true; + m_isBlocked++; - m_mltConsumer->set("refresh", 0); - mlt_service_lock(m_mltConsumer->get_service()); Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; Mlt::Tractor tractor(service); + mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(startTrack)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1); @@ -2399,8 +2433,8 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1); //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; - mlt_service_unlock(m_mltConsumer->get_service()); - m_isBlocked = false; + mlt_service_unlock(service.get_service()); + m_isBlocked--; return false; } else { trackPlaylist.consolidate_blanks(0); @@ -2416,8 +2450,8 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service()); if (!destTrackPlaylist.is_blank_at(moveEnd)) { // error, destination is not empty - mlt_service_unlock(m_mltConsumer->get_service()); - m_isBlocked = false; + mlt_service_unlock(service.get_service()); + m_isBlocked--; return false; } else { Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); @@ -2425,8 +2459,8 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn // error, destination is not empty //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; - mlt_service_unlock(m_mltConsumer->get_service()); - m_isBlocked = false; + mlt_service_unlock(service.get_service()); + m_isBlocked--; return false; } trackPlaylist.consolidate_blanks(0); @@ -2471,11 +2505,11 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true; } } - + mlt_service_unlock(service.get_service()); if (checkLength) mltCheckLength(); - mlt_service_unlock(m_mltConsumer->get_service()); - m_isBlocked = false; - m_mltConsumer->set("refresh", 1); + m_isBlocked--; + //askForRefresh(); + //m_mltConsumer->set("refresh", 1); return true; } @@ -2485,14 +2519,12 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n int new_out = (int)newOut.frames(m_fps) - 1; if (new_in >= new_out) return false; - Mlt::Service service(m_mltProducer->parent().get_service()); - Mlt::Tractor tractor(service); + mlt_service serv = m_mltProducer->parent().get_service(); + m_isBlocked++; + mlt_service_lock(serv); + //m_mltConsumer->set("refresh", 0); - mlt_service_lock(service.get_service()); - m_mltConsumer->set("refresh", 0); - m_isBlocked = true; - mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); @@ -2508,7 +2540,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n 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); @@ -2523,15 +2555,15 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - m_isBlocked = false; - mlt_service_unlock(service.get_service()); - m_mltConsumer->set("refresh", 1); + mlt_service_unlock(serv); + m_isBlocked--; + //askForRefresh(); + //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); return true; } void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) { - // kDebug() << "update transition" << tag << " at pos " << in.frames(25); if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); else { mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false); @@ -2542,12 +2574,10 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) { - m_isBlocked = true; - Mlt::Service service(m_mltProducer->parent().get_service()); - Mlt::Tractor tractor(service); - - //m_mltConsumer->set("refresh", 0); mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service_lock(serv); + m_isBlocked++; + mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); @@ -2592,18 +2622,23 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - m_isBlocked = false; - m_mltConsumer->set("refresh", 1); + mlt_service_unlock(serv); + m_isBlocked--; + //askForRefresh(); + //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); } void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenTime in, GenTime out, QDomElement /*xml*/, bool /*do_refresh*/) { - Mlt::Service service(m_mltProducer->parent().get_service()); + mlt_service serv = m_mltProducer->parent().get_service(); + m_isBlocked++; + mlt_service_lock(serv); + + Mlt::Service service(serv); Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); //if (do_refresh) m_mltConsumer->set("refresh", 0); - mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); @@ -2611,6 +2646,7 @@ void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenT QString resource = mlt_properties_get(properties, "mlt_service"); const int old_pos = (int)((in + out).frames(m_fps) / 2); + kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25); while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; @@ -2629,7 +2665,10 @@ void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenT mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - //if (do_refresh) m_mltConsumer->set("refresh", 1); + mlt_service_unlock(serv); + m_isBlocked--; + //askForRefresh(); + //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); } QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) @@ -2639,7 +2678,7 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) for (int i = 0;i < attribs.count();i++) { QDomElement e = attribs.item(i).toElement(); QString name = e.attribute("name"); - //kDebug()<<"-- TRANSITION PARAM: "<set("refresh", 0); - m_isBlocked = true; + m_isBlocked++; mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -2756,9 +2795,9 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - m_isBlocked = false; mlt_service_unlock(service.get_service()); - m_mltConsumer->set("refresh", 1); + m_isBlocked--; + if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); } @@ -2769,7 +2808,7 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int mlt_service_lock(service.get_service()); m_mltConsumer->set("refresh", 0); - m_isBlocked = true; + m_isBlocked++; mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -2802,7 +2841,7 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - m_isBlocked = false; + m_isBlocked--; mlt_service_unlock(service.get_service()); m_mltConsumer->set("refresh", 1); } @@ -2825,6 +2864,8 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, 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(); @@ -2832,7 +2873,6 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, 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; } @@ -2846,8 +2886,8 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, 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()); @@ -2921,11 +2961,10 @@ void Render::fillSlowMotionProducers() void Render::mltInsertTrack(int ix, bool videoTrack) { blockSignals(true); - m_isBlocked = true; + m_isBlocked++; - m_mltConsumer->set("refresh", 0); - mlt_service_lock(m_mltConsumer->get_service()); Mlt::Service service(m_mltProducer->parent().get_service()); + mlt_service_lock(service.get_service()); if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; Mlt::Tractor tractor(service); @@ -2984,16 +3023,17 @@ void Render::mltInsertTrack(int ix, bool videoTrack) // Add audio mix transition to last track Mlt::Field *field = tractor.field(); Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix"); - //transition->set("mlt_service", "mix"); transition->set("a_track", 1); transition->set("b_track", ct); transition->set("always_active", 1); transition->set("internal_added", 237); transition->set("combine", 1); field->plant_transition(*transition, 1, ct); - - mlt_service_unlock(m_mltConsumer->get_service()); - m_isBlocked = false; + //mlt_service_unlock(m_mltConsumer->get_service()); + mlt_service_unlock(service.get_service()); + //tractor.multitrack()->refresh(); + //tractor.refresh(); + m_isBlocked--; blockSignals(false); } @@ -3016,12 +3056,13 @@ void Render::mltDeleteTrack(int ix) } if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) { tractor.removeChild(transitions.at(i)); - } else if (mappedProps.value("mlt_service") != "mix" && mappedProps.value("b_track").toInt() >= ix) { + i--; + } else if (mappedProps.value("mlt_service") != "mix" && (mappedProps.value("b_track").toInt() >= ix || mappedProps.value("a_track").toInt() >= ix)) { // Transition needs to be moved int a_track = mappedProps.value("a_track").toInt(); int b_track = mappedProps.value("b_track").toInt(); - if (a_track > 0) a_track --; - if (b_track > 0) b_track --; + if (a_track > 0 && a_track >= ix) a_track --; + 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)); @@ -3031,6 +3072,7 @@ void Render::mltDeleteTrack(int ix) } } tractor.removeChild(track); + //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); setSceneList(doc.toString(), m_framePosition); mltCheckLength(); }