X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=a4559e7cbd8b9db7f891528aa9fe47df6b720dd2;hb=2bb3e6b046c0ecd26ced536bd2bfd0487bc7fb06;hp=d543839b177ca82be59265ac6f5188ca5cd237aa;hpb=9ee79fd8451ad27df8202a62b7af2e6ab2a12dcf;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index d543839b..a4559e7c 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -63,13 +63,10 @@ Render::Render(const QString & rendererName, int winid, int extid, QWidget *pare connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout())); m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties"); + buildConsumer(); - Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black"); - m_mltProducer = producer; - if (m_blackClip) delete m_blackClip; - m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); - m_blackClip->set("id", "black"); + m_mltProducer = m_blackClip->cut(0, 50); m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0.0); } @@ -93,7 +90,12 @@ void Render::closeMlt() { void Render::buildConsumer() { char *tmp; - tmp = decodedString(KdenliveSettings::current_profile()); + m_activeProfile = KdenliveSettings::current_profile(); + tmp = decodedString(m_activeProfile); + setenv("MLT_PROFILE", tmp, 1); + if (m_blackClip) delete m_blackClip; + m_blackClip = NULL; + m_mltProfile = new Mlt::Profile(tmp); delete[] tmp; @@ -112,6 +114,7 @@ void Render::buildConsumer() { m_mltConsumer->set("resize", 1); m_mltConsumer->set("window_id", m_winid); m_mltConsumer->set("terminate_on_pause", 1); + m_mltConsumer->set("window_background", decodedString(KdenliveSettings::window_background().name())); m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); m_mltConsumer->set("rescale", "nearest"); @@ -140,16 +143,19 @@ void Render::buildConsumer() { m_mltConsumer->set("progressive", 1); m_mltConsumer->set("audio_buffer", 1024); m_mltConsumer->set("frequency", 48000); + + m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_blackClip->set("id", "black"); + } int Render::resetProfile() { if (!m_mltConsumer) return 0; - QString currentProfile = getenv("MLT_PROFILE"); - if (currentProfile == KdenliveSettings::current_profile()) { + if (m_activeProfile == KdenliveSettings::current_profile()) { kDebug() << "reset to same profile, nothing to do"; return 1; } - kDebug() << "// RESETTING PROFILE FROM: " << currentProfile << " TO: " << KdenliveSettings::current_profile(); + kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << KdenliveSettings::current_profile(); if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); @@ -162,22 +168,24 @@ int Render::resetProfile() { delete m_mltProducer; } m_mltProducer = NULL; - if (m_mltProfile) delete m_mltProfile; - m_mltProfile = NULL; + + //WARNING: Trying to delete the profile will crash when trying to display a clip afterwards... + /*if (m_mltProfile) delete m_mltProfile; + m_mltProfile = NULL;*/ + buildConsumer(); //kDebug() << "//RESET WITHSCENE: " << scene; setSceneList(scene, pos); - char *tmp = decodedString(scene); + /*char *tmp = decodedString(scene); Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp); delete[] tmp; m_mltProducer = producer; - if (m_blackClip) delete m_blackClip; m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); m_mltProducer->optimise(); m_mltProducer->set_speed(0); - connectPlaylist(); + connectPlaylist();*/ //delete m_mltProfile; // mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer()); @@ -453,7 +461,7 @@ void Render::slotSplitView(bool doit) { } } -void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { +void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer) { int height = 50; int width = (int)(height * m_mltProfile->dar()); QMap < QString, QString > filePropertyMap; @@ -462,7 +470,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { KUrl url = KUrl(xml.attribute("resource", QString::null)); Mlt::Producer *producer = NULL; if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap); + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); return; } if (xml.attribute("type").toInt() == COLOR) { @@ -591,11 +599,11 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { pix.fill(Qt::black); mlt_pool_release(new_image); - emit replyGetImage(clipId, 0, pix, width, height); + emit replyGetImage(clipId, pix); } else if (frame->get_int("test_audio") == 0) { QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height)); - emit replyGetImage(clipId, 0, pixmap, width, height); + emit replyGetImage(clipId, pixmap); filePropertyMap["type"] = "audio"; } } @@ -638,6 +646,18 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { if (producer->get(property)) filePropertyMap["videocodec"] = producer->get(property); } + + if (KdenliveSettings::dropbframes()) { + 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"; + producer->set("skip_loop_filter", "all"); + producer->set("skip_frame", "bidir"); + } + } + } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!"; if (producer->get_int("audio_index") > -1) { // Get the audio_index @@ -664,7 +684,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { metadataPropertyMap[ name.section(".", 0, -2)] = value; } - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap); + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); kDebug() << "REquested fuile info for: " << url.path(); if (frame) delete frame; //if (producer) delete producer; @@ -718,6 +738,8 @@ void Render::setProducer(Mlt::Producer *producer, int position) { m_mltConsumer->stop(); } else return; + m_mltConsumer->purge(); + m_isBlocked = true; if (m_mltProducer) { m_mltProducer->set_speed(0); @@ -725,8 +747,13 @@ void Render::setProducer(Mlt::Producer *producer, int position) { m_mltProducer = NULL; emit stopped(); } - if (producer) m_mltProducer = new Mlt::Producer(producer->get_producer()); - else m_mltProducer = new Mlt::Producer(); + if (producer) { + m_mltProducer = new Mlt::Producer(producer->get_producer()); + } else m_mltProducer = m_blackClip->cut(0, 50); + /*if (KdenliveSettings::dropbframes()) { + m_mltProducer->set("skip_loop_filter", "all"); + m_mltProducer->set("skip_frame", "bidir"); + }*/ if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; m_fps = m_mltProducer->get_fps(); @@ -749,6 +776,7 @@ void Render::setSceneList(QDomDocument list, int position) { void Render::setSceneList(QString playlist, int position) { if (m_winid == -1) return; m_isBlocked = true; + m_slowmotionProducers.clear(); //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; @@ -773,9 +801,7 @@ void Render::setSceneList(QString playlist, int position) { char *tmp = decodedString(playlist); m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); delete[] tmp; - if (m_blackClip) delete m_blackClip; - m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); - m_blackClip->set("id", "black"); + if (!m_mltProducer || !m_mltProducer->is_valid()) { kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp; } @@ -807,6 +833,7 @@ 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. @@ -819,7 +846,7 @@ void Render::setSceneList(QString playlist, int position) { } /** Create the producer from the Westley QDomDocument */ -QString Render::sceneList() { +const QString Render::sceneList() { QString playlist; Mlt::Consumer westleyConsumer(*m_mltProfile , "westley:kdenlive_playlist"); m_mltProducer->optimise(); @@ -996,7 +1023,7 @@ void Render::stop() { if (m_mltConsumer && !m_mltConsumer->is_stopped()) { kDebug() << "///////////// RENDER STOPPED: " << m_name; m_isBlocked = true; - m_mltConsumer->set("refresh", 0); + //m_mltConsumer->set("refresh", 0); m_mltConsumer->stop(); // delete m_mltConsumer; // m_mltConsumer = NULL; @@ -1102,6 +1129,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { if (!m_mltProducer || !m_mltConsumer) return; m_isBlocked = false; + if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1; m_mltProducer->set("out", stopTime.frames(m_fps)); m_mltProducer->seek((int)(startTime.frames(m_fps))); m_mltProducer->set_speed(1.0); @@ -1110,7 +1138,8 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { } void Render::resetZoneMode() { - m_mltProducer->set("out", m_mltProducer->get_length() - 1); + if (!m_isZoneMode && !m_isLoopMode) return; + m_mltProducer->set("out", m_originalOut); //m_mltProducer->set("eof", "pause"); m_isZoneMode = false; m_isLoopMode = false; @@ -1290,6 +1319,28 @@ void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pr Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); //kDebug()<<"/// INSERT cLIP: "<get("resource"); + url.append("?" + QString::number(speed)); + 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); + delete[] tmp; + QString id = prod->get("id"); + if (id.contains('_')) id = id.section('_', 0, 0); + QString producerid = "slowmotion:" + id + ":" + QString::number(speed); + tmp = decodedString(producerid); + slowprod->set("id", tmp); + delete[] tmp; + m_slowmotionProducers.insert(url, slowprod); + } + prod = slowprod; + } + Mlt::Producer *clip = prod->cut((int) info.cropStart.frames(m_fps), (int)(info.endPos - info.startPos + info.cropStart).frames(m_fps) - 1); int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1); @@ -1588,7 +1639,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt int newLength = 0; Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; - kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; + //kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -1597,12 +1648,21 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt int clipLength = trackPlaylist.clip_length(clipIndex); Mlt::Producer clip(trackPlaylist.get_clip(clipIndex)); - QString serv = clip.parent().get("mlt_service"); - QString id = clip.parent().get("id"); - kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service"); + if (!clip.is_valid() || clip.is_blank()) { + // invalid clip + return -1; + } + Mlt::Producer clipparent = clip.parent(); + if (!clipparent.is_valid() || clipparent.is_blank()) { + // invalid clip + return -1; + } + QString serv = clipparent.get("mlt_service"); + QString id = clipparent.get("id"); + //kDebug() << "CLIP SERVICE: " << serv; if (serv == "avformat" && speed != 1.0) { mlt_service_lock(service.get_service()); - QString url = clip.parent().get("resource"); + QString url = clipparent.get("resource"); url.append("?" + QString::number(speed)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { @@ -1653,7 +1713,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt } else if (serv == "framebuffer") { mlt_service_lock(service.get_service()); - QString url = clip.parent().get("resource"); + QString url = clipparent.get("resource"); url = url.section("?", 0, 0); url.append("?" + QString::number(speed)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); @@ -1680,7 +1740,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt Mlt::Producer *cut; if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) { GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; - cut = slowprod->cut((int)(info.cropStart.frames(m_fps)), (int)(info.cropStart.frames(m_fps) + maxLength.frames(m_fps) - 1)); + cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)(info.cropStart.frames(m_fps) / speed + maxLength.frames(m_fps) - 1)); } else cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)((info.cropStart / speed + newDuration).frames(m_fps) - 1)); trackPlaylist.insert_at(startPos, *cut, 1); @@ -1694,8 +1754,8 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt return newLength; } -bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) { - +bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh) { + kDebug() << "// TRYing to remove effect at: " << index; Mlt::Service service(m_mltProducer->parent().get_service()); bool success = false; Mlt::Tractor tractor(service); @@ -1716,10 +1776,11 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool do 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 { + } else if (updateIndex) { + // 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++; filter = clipService.filter(ct); } m_isBlocked = false; @@ -1871,7 +1932,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par 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); + mltRemoveEffect(track, position, index, true); bool success = mltAddEffect(track, position, params); return success; } @@ -2038,21 +2099,25 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) { int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; int newDuration = (int) clipDuration.frames(m_fps) - 1; trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart); - //trackPlaylist.consolidate_blanks(0); + 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; + 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 (trackPlaylist.is_blank(clipIndex)) { - int blankStart = trackPlaylist.clip_start(clipIndex); - int blankDuration = trackPlaylist.clip_length(clipIndex) - 1; - if (diff - blankDuration == 1) { - trackPlaylist.remove(clipIndex); - } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff); - } else { - kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; + if (clipIndex < trackPlaylist.count()) { + // 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 (diff > blankDuration) kDebug() << "// ERROR blank clip is not large enough to get back required space!!!"; + if (diff - blankDuration == 1) { + trackPlaylist.remove(clipIndex); + } else trackPlaylist.remove_region(blankStart, diff - 1); + } else { + kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; + } } } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); @@ -2092,6 +2157,35 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) { refresh(); } + +bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) { + Mlt::Service service(m_mltProducer->parent().get_service()); + int frameOffset = (int) diff.frames(m_fps); + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(info.track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) { + kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; + return false; + } + 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) { + kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; + mlt_service_unlock(service.get_service()); + return false; + } + int previousStart = clip->get_in(); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; + m_isBlocked = true; + trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset); + m_isBlocked = false; + mlt_service_unlock(service.get_service()); + m_mltConsumer->set("refresh", 1); + return true; +} + bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { //kDebug() << "//////// RSIZING CLIP from: "<parent().get_service()); @@ -2105,16 +2199,12 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { } mlt_service_lock(service.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); - /*int previousStart = trackPlaylist.clip_start(clipIndex); - int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/ - //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (clip == NULL) { kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; mlt_service_unlock(service.get_service()); return false; } - //m_mltConsumer->set("refresh", 0); int previousStart = clip->get_in(); int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; m_isBlocked = true; @@ -2155,6 +2245,10 @@ bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTim void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) { + if (prod == NULL || !prod->is_valid()) { + kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!"; + return; + } kDebug() << "NEW PROD ID: " << prod->get("id"); m_mltConsumer->set("refresh", 0); kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; @@ -2286,7 +2380,11 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn return true; } -void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { +bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { + int new_in = (int)newIn.frames(m_fps); + 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::Field *field = tractor.field(); @@ -2302,9 +2400,6 @@ void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n QString resource = mlt_properties_get(properties, "mlt_service"); int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2; - int new_in = (int)newIn.frames(m_fps); - int new_out = (int)newOut.frames(m_fps) - 1; - while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; int currentTrack = mlt_transition_get_b_track(tr); @@ -2332,6 +2427,7 @@ void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n m_isBlocked = false; mlt_service_unlock(service.get_service()); 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) { @@ -2608,8 +2704,8 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int } -void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { - +bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { + if (in >= out) return false; QMap args = mltGetTransitionParamsFromXml(xml); Mlt::Service service(m_mltProducer->parent().get_service()); @@ -2639,6 +2735,7 @@ void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, field->plant_transition(*transition, a_track, b_track); delete[] transId; refresh(); + return true; } void Render::mltSavePlaylist() { @@ -2654,20 +2751,19 @@ void Render::mltSavePlaylist() { QList Render::producersList() { QList prods = QList (); - QStringList ids; Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) return prods; Mlt::Tractor tractor(service); + QStringList ids; int trackNb = tractor.count(); for (int t = 1; t < trackNb; t++) { Mlt::Producer trackProducer(tractor.track(t)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipNb = trackPlaylist.count(); - kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; + //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; for (int i = 0; i < clipNb; i++) { - Mlt::Producer *prod = trackPlaylist.get_clip(i); - Mlt::Producer *nprod = new Mlt::Producer(prod->get_parent()); - //kDebug()<<"PROD: "<get("producer")<<", ID: "<get("id")<get("resource"); + Mlt::Producer *nprod = new Mlt::Producer(trackPlaylist.get_clip(i)->get_parent()); if (nprod && !nprod->is_blank() && !ids.contains(nprod->get("id"))) { ids.append(nprod->get("id")); prods.append(nprod); @@ -2677,6 +2773,33 @@ QList Render::producersList() { return prods; } +void Render::fillSlowMotionProducers() { + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) return; + + Mlt::Tractor tractor(service); + + int trackNb = tractor.count(); + for (int t = 1; t < trackNb; t++) { + Mlt::Producer trackProducer(tractor.track(t)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipNb = trackPlaylist.count(); + for (int i = 0; i < clipNb; i++) { + Mlt::Producer *nprod = new Mlt::Producer(trackPlaylist.get_clip(i)->get_parent()); + if (nprod && !nprod->is_blank()) { + QString id = nprod->get("id"); + if (id.startsWith("slowmotion:")) { + // this is a slowmotion producer, add it to the list + QString url = nprod->get("resource"); + if (!m_slowmotionProducers.contains(url)) { + m_slowmotionProducers.insert(url, nprod); + } + } + } + } + } +} + void Render::mltInsertTrack(int ix, bool videoTrack) { blockSignals(true); m_isBlocked = true; @@ -2785,6 +2908,7 @@ void Render::mltDeleteTrack(int ix) { } tractor.removeChild(track); setSceneList(doc.toString(), m_framePosition); + mltCheckLength(); return; blockSignals(true); @@ -2858,5 +2982,26 @@ void Render::mltDeleteTrack(int ix) { blockSignals(false); } + +void Render::updatePreviewSettings() { + kDebug() << "////// RESTARTING CONSUMER"; + if (!m_mltConsumer || !m_mltProducer) return; + if (m_mltProducer->get_playtime() == 0) return; + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) return; + + //m_mltConsumer->set("refresh", 0); + if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); + m_mltConsumer->purge(); + QString scene = sceneList(); + int pos = 0; + if (m_mltProducer) { + pos = m_mltProducer->position(); + delete m_mltProducer; + } + m_mltProducer = NULL; + setSceneList(scene, pos); +} + #include "renderer.moc"