X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=7b4be874b81f173ff2d0b9bab45459fb1a0c8734;hb=623c7ac1fac4f52a39f102649d062cc900e470d6;hp=e1207dc21b8521318dbdd2ef3139c476eb5967aa;hpb=73e4527d1abd954f088b317e59c8f0cfc1cd2e16;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index e1207dc2..7b4be874 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -42,11 +42,25 @@ #include + + +static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl) +{ + if (level > MLT_LOG_ERROR) return; + QString error; + QApplication::postEvent(qApp->activeWindow() , new MltErrorEvent(error.vsprintf(fmt, vl).simplified())); +} + + 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? if (self->m_isBlocked) return; - if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) { + Mlt::Frame frame(frame_ptr); +#ifdef Q_WS_MAC + self->showFrame(frame); +#endif + if (frame.get_double("_speed") == 0.0) { self->emitConsumerStopped(); } else { self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); @@ -59,21 +73,23 @@ Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), + m_mltProfile(NULL), m_framePosition(0), m_isZoneMode(false), m_isLoopMode(false), m_isSplitView(false), m_blackClip(NULL), m_winid(winid) +#ifdef Q_WS_MAC + , m_glWidget(0) +#endif { 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;*/ - m_osdTimer = new QTimer(this); - connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout())); + /*m_osdTimer = new QTimer(this); + connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/ buildConsumer(); @@ -91,8 +107,40 @@ Render::~Render() void Render::closeMlt() { - delete m_osdTimer; - delete m_refreshTimer; + //delete m_osdTimer; + if (m_mltProducer) { + Mlt::Service service(m_mltProducer->parent().get_service()); + mlt_service_lock(service.get_service()); + + if (service.type() == tractor_type) { + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + mlt_service nextservice = mlt_service_get_producer(service.get_service()); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + // Delete all transitions + while (mlt_type == "transition") { + mlt_field_disconnect_service(field->get_field(), nextservice); + nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + } + + int trackNb = tractor.count(); + while (trackNb > 0) { + Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); + trackNb--; + } + } + mlt_service_unlock(service.get_service()); + } + + kDebug() << "// // // CLOSE RENDERER " << m_name; delete m_mltConsumer; delete m_mltProducer; delete m_blackClip; @@ -109,6 +157,8 @@ void Render::buildConsumer() delete m_blackClip; m_blackClip = NULL; + //TODO: uncomment following line when everything is clean + //if (m_mltProfile) delete m_mltProfile; m_mltProfile = new Mlt::Profile(tmp); delete[] tmp; @@ -123,7 +173,13 @@ void Render::buildConsumer() } setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1); +#ifdef Q_WS_MAC + m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_audio"); + m_mltConsumer->set("preview_off", 1); + m_mltConsumer->set("preview_format", mlt_image_rgb24a); +#else m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); +#endif m_mltConsumer->set("resize", 1); m_mltConsumer->set("window_id", m_winid); m_mltConsumer->set("terminate_on_pause", 1); @@ -134,6 +190,7 @@ void Render::buildConsumer() // FIXME: the event object returned by the listen gets leaked... m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); m_mltConsumer->set("rescale", "nearest"); + mlt_log_set_callback(kdenlive_callback); QString audioDevice = KdenliveSettings::audiodevicename(); if (!audioDevice.isEmpty()) { @@ -149,8 +206,13 @@ void Render::buildConsumer() } QString audioDriver = KdenliveSettings::audiodrivername(); + + /* + // Disabled because the "auto" detected driver was sometimes wrong if (audioDriver.isEmpty()) audioDriver = KdenliveSettings::autoaudiodrivername(); + */ + if (!audioDriver.isEmpty()) { tmp = decodedString(audioDriver); m_mltConsumer->set("audio_driver", tmp); @@ -182,16 +244,29 @@ int Render::resetProfile() m_mltConsumer = NULL; QString scene = sceneList(); int pos = 0; + + delete m_blackClip; + m_blackClip = NULL; + if (m_mltProducer) { pos = m_mltProducer->position(); + + 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)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + trackPlaylist.clear(); + trackNb--; + } + } + delete m_mltProducer; } m_mltProducer = 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; @@ -224,7 +299,7 @@ void Render::seek(GenTime time) { if (!m_mltProducer) return; - m_isBlocked = 0; + m_isBlocked = false; m_mltProducer->seek((int)(time.frames(m_fps))); refresh(); } @@ -492,18 +567,28 @@ void Render::slotSplitView(bool doit) } } -void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer) +void Render::getFileProperties(const QDomElement xml, const QString &clipId, bool replaceProducer) { KUrl url = KUrl(xml.attribute("resource", QString())); Mlt::Producer *producer = NULL; - if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { + //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n"; + /*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); return; - } + }*/ if (xml.attribute("type").toInt() == COLOR) { char *tmp = decodedString("colour:" + xml.attribute("colour")); producer = new Mlt::Producer(*m_mltProfile, 0, tmp); delete[] tmp; + } else if (xml.attribute("type").toInt() == TEXT) { + char *tmp = decodedString("kdenlivetitle:" + xml.attribute("resource")); + producer = new Mlt::Producer(*m_mltProfile, 0, tmp); + delete[] tmp; + if (xml.hasAttribute("xmldata")) { + char *tmp = decodedString(xml.attribute("xmldata")); + producer->set("xmldata", tmp); + delete[] tmp; + } } else if (url.isEmpty()) { QDomDocument doc; QDomElement mlt = doc.createElement("mlt"); @@ -610,25 +695,18 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo else filePropertyMap["type"] = "video"; - mlt_image_format format = mlt_image_yuv422; - int frame_width = 0; - int frame_height = 0; - //frame->set("rescale.interp", "hyper"); - frame->set("normalised_height", height); - frame->set("normalised_width", width); + mlt_image_format format = mlt_image_rgb24a; + int frame_width = width; + int frame_height = height; QPixmap pix(width, height); - uint8_t *data = frame->get_image(format, frame_width, frame_height, 0); - uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4); - mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height); - QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32); + QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32); if (!image.isNull()) { pix = QPixmap::fromImage(image.rgbSwapped()); } else pix.fill(Qt::black); - mlt_pool_release(new_image); emit replyGetImage(clipId, pix); } else if (frame->get_int("test_audio") == 0) { @@ -788,7 +866,10 @@ int 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: "; + return -1; + } m_fps = m_mltProducer->get_fps(); int error = connectPlaylist(); @@ -814,8 +895,6 @@ int Render::setSceneList(QString playlist, int position) if (m_winid == -1) return -1; m_isBlocked = true; int error; - qDeleteAll(m_slowmotionProducers.values()); - m_slowmotionProducers.clear(); //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; @@ -827,13 +906,47 @@ int Render::setSceneList(QString playlist, int position) if (!m_mltConsumer->is_stopped()) { m_mltConsumer->stop(); - //m_mltConsumer->set("refresh", 0); } + m_mltConsumer->set("refresh", 0); if (m_mltProducer) { m_mltProducer->set_speed(0); //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo); + + Mlt::Service service(m_mltProducer->parent().get_service()); + mlt_service_lock(service.get_service()); + + if (service.type() == tractor_type) { + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + mlt_service nextservice = mlt_service_get_producer(service.get_service()); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + // Delete all transitions + while (mlt_type == "transition") { + mlt_field_disconnect_service(field->get_field(), nextservice); + nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + } + + int trackNb = tractor.count(); + while (trackNb > 0) { + Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); + trackNb--; + } + } + mlt_service_unlock(service.get_service()); + + qDeleteAll(m_slowmotionProducers.values()); + m_slowmotionProducers.clear(); + delete m_mltProducer; m_mltProducer = NULL; emit stopped(); @@ -947,6 +1060,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) tmppath = decodedString(desc); Mlt::Playlist list; list.insert_at(0, prod, 0); + delete prod; list.set("title", tmppath); delete[] tmppath; xmlConsumer.connect(list); @@ -1028,7 +1142,7 @@ void Render::setVolume(double /*volume*/) if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter"; }*/ refresh(); - m_osdTimer->setSingleShot(2500); + //m_osdTimer->setSingleShot(2500); } void Render::slotOsdTimeout() @@ -1063,23 +1177,6 @@ void Render::start() m_isBlocked = false; } -void Render::clear() -{ - kDebug() << " ********* RENDER CLEAR"; - if (m_mltConsumer) { - //m_mltConsumer->set("refresh", 0); - if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); - } - - if (m_mltProducer) { - //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo); - m_mltProducer->set_speed(0.0); - delete m_mltProducer; - m_mltProducer = NULL; - emit stopped(); - } -} - void Render::stop() { if (m_mltProducer == NULL) return; @@ -1227,10 +1324,15 @@ void Render::seekToFrame(int pos) refresh(); } -void Render::askForRefresh() +void Render::seekToFrameDiff(int diff) { - // Use a Timer so that we don't refresh too much - m_refreshTimer->start(300); + //kDebug()<<" ********* RENDER SEEK TO POS"; + if (!m_mltProducer) + return; + m_isBlocked = false; + resetZoneMode(); + m_mltProducer->seek(m_mltProducer->position() + diff); + refresh(); } void Render::doRefresh() @@ -1243,7 +1345,6 @@ void Render::refresh() { if (!m_mltProducer || m_isBlocked) return; - m_refreshTimer->stop(); if (m_mltConsumer) { m_mltConsumer->set("refresh", 1); } @@ -1277,6 +1378,11 @@ GenTime Render::seekPosition() const else return GenTime(); } +int Render::seekFramePosition() const +{ + if (m_mltProducer) return (int) m_mltProducer->position(); + return 0; +} const QString & Render::rendererName() const { @@ -1338,90 +1444,119 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/) //if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003)); } +#ifdef Q_WS_MAC +void Render::showFrame(Mlt::Frame& frame) +{ + mlt_image_format format = mlt_image_rgb24a; + int width = 0; + int height = 0; + const uchar* image = frame.get_image(format, width, height); + QImage qimage(width, height, QImage::Format_ARGB32); + memcpy(qimage.scanLine(0), image, width * height * 4); + emit showImageSignal(qimage); +} +#endif + /** MLT PLAYLIST DIRECT MANIPULATON **/ -void Render::mltCheckLength() +void Render::mltCheckLength(Mlt::Tractor *tractor) { //kDebug()<<"checking track length: "<get_service()); - Mlt::Tractor tractor(service); - - int trackNb = tractor.count(); + int trackNb = tractor->count(); int duration = 0; int trackDuration; if (trackNb == 1) { - Mlt::Producer trackProducer(tractor.track(0)); + Mlt::Producer trackProducer(tractor->track(0)); duration = trackProducer.get_playtime() - 1; m_mltProducer->set("out", duration); emit durationChanged(duration); return; } while (trackNb > 1) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + Mlt::Producer trackProducer(tractor->track(trackNb - 1)); trackDuration = trackProducer.get_playtime() - 1; - //kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration; if (trackDuration > duration) duration = trackDuration; trackNb--; } - Mlt::Producer blackTrackProducer(tractor.track(0)); + Mlt::Producer blackTrackProducer(tractor->track(0)); if (blackTrackProducer.get_playtime() - 1 != duration) { Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service()); 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 && blackclip->is_blank()) { + delete blackclip; + blackclip = NULL; } - if (blackclip == NULL || blackclip->is_blank() || blackTrackPlaylist.count() != 1) { + + if (blackclip == NULL || blackTrackPlaylist.count() != 1) { blackTrackPlaylist.clear(); - blackTrackPlaylist.append(*m_blackClip, 0, duration - 1); - } else blackTrackPlaylist.resize_clip(0, 0, duration - 1); + m_blackClip->set("length", duration); + m_blackClip->set("out", duration - 1); + blackclip = m_blackClip->cut(0, duration - 1); + blackTrackPlaylist.insert_at(0, blackclip, 1); + } else { + if (duration > blackclip->parent().get_length()) { + blackclip->parent().set("length", duration); + blackclip->parent().set("out", duration - 1); + blackclip->set("length", duration); + } + 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) +int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) { if (m_mltProducer == NULL) { kDebug() << "PLAYLIST NOT INITIALISED //////"; - return; + return -1; } Mlt::Producer parentProd(m_mltProducer->parent()); if (parentProd.get_producer() == NULL) { kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; - return; + return -1; } Mlt::Service service(parentProd.get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return -1; + } 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; + return -1; } mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); //kDebug()<<"/// INSERT cLIP: "< 1) { // We want a slowmotion producer double speed = element.attribute("speed", "1.0").toDouble(); + int strobe = element.attribute("strobe", "1").toInt(); QString url = QString::fromUtf8(prod->get("resource")); url.append('?' + QString::number(speed)); + if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); 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); + if (strobe > 1) slowprod->set("strobe", strobe); delete[] tmp; QString id = prod->get("id"); if (id.contains('_')) id = id.section('_', 0, 0); QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + if (strobe > 1) producerid.append(':' + QString::number(strobe)); tmp = decodedString(producerid); slowprod->set("id", tmp); delete[] tmp; @@ -1431,16 +1566,16 @@ void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pr } 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); - + int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), clip, 1); + delete clip; /*if (QString(prod->get("transparency")).toInt() == 1) mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());*/ + if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(&tractor); mlt_service_unlock(service.get_service()); - - if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(); - //tractor.multitrack()->refresh(); - //tractor.refresh(); + /*tractor.multitrack()->refresh(); + tractor.refresh();*/ + return 0; } @@ -1450,7 +1585,10 @@ void Render::mltCutClip(int track, GenTime position) m_isBlocked = true; Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return; + } Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); @@ -1489,6 +1627,8 @@ void Render::mltCutClip(int track, GenTime position) } Mlt::Service clipService(original->get_service()); Mlt::Service dupService(clip->get_service()); + delete original; + delete clip; int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { @@ -1533,7 +1673,10 @@ void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr bool Render::mltRemoveClip(int track, GenTime position) { Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } Mlt::Tractor tractor(service); mlt_service_lock(service.get_service()); @@ -1541,9 +1684,9 @@ bool Render::mltRemoveClip(int track, GenTime position) Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); - /* // Display playlist info - kDebug()<<"//// BEFORE"; - for (int i = 0; i < trackPlaylist.count(); i++) { + // Display playlist info + //kDebug() << "//// BEFORE -( " << position.frames(m_fps) << " )-------------------------------"; + /*for (int i = 0; i < trackPlaylist.count(); i++) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -1552,10 +1695,13 @@ bool Render::mltRemoveClip(int track, GenTime position) }*/ if (trackPlaylist.is_blank(clipIndex)) { kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(25); + mlt_service_unlock(service.get_service()); return false; } + //kDebug()<<"//// Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------"; m_isBlocked = true; - trackPlaylist.replace_with_blank(clipIndex); + Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); + if (clip) delete clip; trackPlaylist.consolidate_blanks(0); /*if (QString(clip.parent().get("transparency")).toInt() == 1) mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());*/ @@ -1570,7 +1716,7 @@ bool Render::mltRemoveClip(int track, GenTime position) kDebug()<<"CLIP "< trackClipStartList, QMap if (insertPos != -1) { insertPos += offset; int clipIndex = trackPlaylist.get_clip_index_at(insertPos); - if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1); - else { + if (diff > 0) { + trackPlaylist.insert_blank(clipIndex, diff - 1); + } else { if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; - if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + if (!trackPlaylist.is_blank(clipIndex)) { + kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + } int position = trackPlaylist.clip_start(clipIndex); - trackPlaylist.remove_region(position, - diff - 1); + int blankDuration = trackPlaylist.clip_length(clipIndex); + diff = -diff; + if (blankDuration - diff == 0) { + trackPlaylist.remove(clipIndex); + } else trackPlaylist.remove_region(position, diff); } trackPlaylist.consolidate_blanks(0); } @@ -1704,12 +1857,20 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap int clipIndex = trackPlaylist.get_clip_index_at(insertPos); - if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1); - else { - if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; - if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + if (diff > 0) { + trackPlaylist.insert_blank(clipIndex, diff - 1); + } else { + if (!trackPlaylist.is_blank(clipIndex)) { + clipIndex --; + } + if (!trackPlaylist.is_blank(clipIndex)) { + kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + } int position = trackPlaylist.clip_start(clipIndex); - trackPlaylist.remove_region(position, - diff - 1); + int blankDuration = trackPlaylist.clip_length(clipIndex); + if (diff + blankDuration == 0) { + trackPlaylist.remove(clipIndex); + } else trackPlaylist.remove_region(position, - diff); } trackPlaylist.consolidate_blanks(0); } @@ -1742,7 +1903,7 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap } } mlt_service_unlock(service.get_service()); - mltCheckLength(); + mltCheckLength(&tractor); m_mltConsumer->set("refresh", 1); } @@ -1764,12 +1925,15 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) } } -int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod) +int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int strobe, Mlt::Producer *prod) { m_isBlocked = true; int newLength = 0; Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return -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)); @@ -1797,22 +1961,25 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt QString serv = clipparent.get("mlt_service"); QString id = clipparent.get("id"); //kDebug() << "CLIP SERVICE: " << serv; - if (serv == "avformat" && speed != 1.0) { + if (serv == "avformat" && (speed != 1.0 || strobe > 1)) { mlt_service_lock(service.get_service()); QString url = QString::fromUtf8(clipparent.get("resource")); url.append('?' + QString::number(speed)); + if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); 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); + if (strobe > 1) slowprod->set("strobe", strobe); delete[] tmp; QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + if (strobe > 1) producerid.append(':' + QString::number(strobe)); tmp = decodedString(producerid); slowprod->set("id", tmp); delete[] tmp; m_slowmotionProducers.insert(url, slowprod); } - trackPlaylist.replace_with_blank(clipIndex); + Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); // Check that the blank space is long enough for our new duration clipIndex = trackPlaylist.get_clip_index_at(startPos); @@ -1825,15 +1992,16 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt // move all effects to the correct producer mltPasteEffects(clip, cut); - - trackPlaylist.insert_at(startPos, *cut, 1); + trackPlaylist.insert_at(startPos, cut, 1); + delete cut; + delete clip; clipIndex = trackPlaylist.get_clip_index_at(startPos); newLength = trackPlaylist.clip_length(clipIndex); mlt_service_unlock(service.get_service()); - } else if (speed == 1.0) { + } else if (speed == 1.0 && strobe < 2) { mlt_service_lock(service.get_service()); - trackPlaylist.replace_with_blank(clipIndex); + Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); // Check that the blank space is long enough for our new duration @@ -1851,7 +2019,9 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt // move all effects to the correct producer mltPasteEffects(clip, cut); - trackPlaylist.insert_at(startPos, *cut, 1); + trackPlaylist.insert_at(startPos, cut, 1); + delete cut; + delete clip; clipIndex = trackPlaylist.get_clip_index_at(startPos); newLength = trackPlaylist.clip_length(clipIndex); mlt_service_unlock(service.get_service()); @@ -1861,22 +2031,25 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt QString url = QString::fromUtf8(clipparent.get("resource")); url = url.section('?', 0, 0); url.append('?' + QString::number(speed)); + if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); 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; + slowprod->set("strobe", strobe); QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed); + if (strobe > 1) producerid.append(':' + QString::number(strobe)); tmp = decodedString(producerid); slowprod->set("id", tmp); delete[] tmp; m_slowmotionProducers.insert(url, slowprod); } - trackPlaylist.replace_with_blank(clipIndex); + Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); GenTime oldDuration = GenTime(clipLength, m_fps); - GenTime newDuration = oldDuration * oldspeed / speed; + GenTime newDuration = oldDuration * (oldspeed / speed); // Check that the blank space is long enough for our new duration clipIndex = trackPlaylist.get_clip_index_at(startPos); @@ -1891,7 +2064,9 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt // move all effects to the correct producer mltPasteEffects(clip, cut); - trackPlaylist.insert_at(startPos, *cut, 1); + trackPlaylist.insert_at(startPos, cut, 1); + delete cut; + delete clip; clipIndex = trackPlaylist.get_clip_index_at(startPos); newLength = trackPlaylist.clip_length(clipIndex); @@ -1899,14 +2074,13 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt } delete clip; - if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(); + if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor); m_isBlocked = false; return newLength; } 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); @@ -1919,6 +2093,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up return success; } Mlt::Service clipService(clip->get_service()); + delete clip; // if (tag.startsWith("ladspa")) tag = "ladspa"; m_isBlocked = true; int ct = 0; @@ -1926,7 +2101,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up while (filter) { if ((index == "-1" && strcmp(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; + //kDebug()<<"Deleted filter id:"<get("kdenlive_id")<<", ix:"<get("kdenlive_ix")<<", SERVICE:"<get("mlt_service"); } 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); @@ -1955,7 +2130,8 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para } Mlt::Service clipService(clip->get_service()); m_isBlocked = true; - + int duration = clip->get_playtime(); + delete clip; // temporarily remove all effects after insert point QList filtersList; const int filter_ix = params.paramValue("kdenlive_ix").toInt(); @@ -1984,7 +2160,6 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para char *starttag = decodedString(params.paramValue("starttag", "start")); char *endtag = decodedString(params.paramValue("endtag", "end")); kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; - int duration = clip->get_playtime(); //double max = params.paramValue("max").toDouble(); double min = params.paramValue("min").toDouble(); double factor = params.paramValue("factor", "1").toDouble(); @@ -2085,12 +2260,12 @@ 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, true); + mltRemoveEffect(track, position, index, false); bool success = mltAddEffect(track, position, params); return success; } - // create filter + // find filter Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); @@ -2103,6 +2278,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par return false; } Mlt::Service clipService(clip->get_service()); + delete clip; m_isBlocked = true; int ct = 0; Mlt::Filter *filter = clipService.filter(ct); @@ -2136,7 +2312,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par m_isBlocked = false; return success; } - + mlt_service_lock(service.get_service()); for (int j = 0; j < params.count(); j++) { char *name = decodedString(params.at(j).name()); char *value = decodedString(params.at(j).value()); @@ -2144,6 +2320,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par delete[] name; delete[] value; } + mlt_service_unlock(service.get_service()); m_isBlocked = false; refresh(); @@ -2166,6 +2343,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) return; } Mlt::Service clipService(clip->get_service()); + delete clip; m_isBlocked = true; int ct = 0; QList filtersList; @@ -2254,6 +2432,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1); if (newDuration > clip->get_length()) { clip->parent().set("length", newDuration + 1); + clip->parent().set("out", newDuration); clip->set("length", newDuration + 1); } if (newDuration > clip->get_out()) { @@ -2272,11 +2451,13 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) // 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) { + int blankDuration = trackPlaylist.clip_length(clipIndex); + if (diff > blankDuration) { + kDebug() << "// ERROR blank clip is not large enough to get back required space!!!"; + } + if (diff - blankDuration == 0) { trackPlaylist.remove(clipIndex); - } else trackPlaylist.remove_region(blankStart, diff - 1); + } else trackPlaylist.remove_region(blankStart, diff); } else { kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; } @@ -2285,7 +2466,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) trackPlaylist.consolidate_blanks(0); mlt_service_unlock(service.get_service()); - if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(); + if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(&tractor); /*if (QString(clip->parent().get("transparency")).toInt() == 1) { //mltResizeTransparency(previousStart, previousStart, previousStart + newDuration, track, QString(clip->parent().get("id")).toInt()); mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt()); @@ -2420,27 +2601,32 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) kDebug() << "NEW PROD ID: " << prod->get("id"); 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()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return; + } + mlt_service_lock(m_mltConsumer->get_service()); Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(pos + 1); - Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); - if (clipProducer.is_blank()) { + Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); + if (clipProducer->is_blank()) { kDebug() << "// ERROR UPDATING CLIP PROD"; + delete clipProducer; mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked--; return; } - Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out()); + Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); // move all effects to the correct producer - mltPasteEffects(&clipProducer, clip); - + mltPasteEffects(clipProducer, clip); trackPlaylist.insert_at(pos, clip, 1); + delete clip; + delete clipProducer; mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked--; } @@ -2450,7 +2636,10 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn m_isBlocked++; Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } Mlt::Tractor tractor(service); mlt_service_lock(service.get_service()); @@ -2460,10 +2649,11 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex; bool checkLength = false; if (endTrack == startTrack) { - Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); - if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer.is_blank()) { + Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); + if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer->is_blank()) { // error, destination is not empty if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1); + delete clipProducer; //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); @@ -2472,6 +2662,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } else { trackPlaylist.consolidate_blanks(0); int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); + delete clipProducer; /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); }*/ @@ -2487,10 +2678,11 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn m_isBlocked--; return false; } else { - Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); - if (clipProducer.is_blank()) { + Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); + if (clipProducer->is_blank()) { // error, destination is not empty //int ix = trackPlaylist.get_clip_index_at(moveEnd); + delete clipProducer; kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); m_isBlocked--; @@ -2500,24 +2692,31 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn destTrackPlaylist.consolidate_blanks(1); Mlt::Producer *clip; // check if we are moving a slowmotion producer - QString serv = clipProducer.parent().get("mlt_service"); - QString currentid = clipProducer.parent().get("id"); + QString serv = clipProducer->parent().get("mlt_service"); + QString currentid = clipProducer->parent().get("id"); if (serv == "framebuffer" || currentid.endsWith("_video")) { - clip = &clipProducer; + clip = clipProducer; } else { if (prod == NULL) { // Special case: prod is null when using placeholder clips. // in that case, use the producer existing in playlist. Note that // it will bypass the one producer per track logic and might cause // Sound cracks if clip is moved so that it overlaps another copy of itself - clip = clipProducer.cut(clipProducer.get_in(), clipProducer.get_out()); - } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out()); + clip = clipProducer->cut(clipProducer->get_in(), clipProducer->get_out()); + } else clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); } // move all effects to the correct producer - mltPasteEffects(&clipProducer, clip); + mltPasteEffects(clipProducer, clip); int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1); + if (clip == clipProducer) { + delete clip; + clip = NULL; + } else { + delete clip; + delete clipProducer; + } destTrackPlaylist.consolidate_blanks(0); /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { kDebug() << "//////// moving clip transparency"; @@ -2528,7 +2727,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } } mlt_service_unlock(service.get_service()); - if (checkLength) mltCheckLength(); + if (checkLength) mltCheckLength(&tractor); m_isBlocked--; //askForRefresh(); //m_mltConsumer->set("refresh", 1); @@ -2579,7 +2778,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n } mlt_service_unlock(serv); m_isBlocked--; - //askForRefresh(); + refresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); return true; } @@ -2589,8 +2788,9 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); else { mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false); - mltAddTransition(tag, a_track, b_track, in, out, xml); + mltAddTransition(tag, a_track, b_track, in, out, xml, false); } + refresh(); //mltSavePlaylist(); } @@ -2600,7 +2800,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G mlt_service_lock(serv); m_isBlocked++; - mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); @@ -2623,6 +2822,10 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G QString key; mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr); mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").toInt()); + // update the transition id in case it uses the same MLT service but different Kdenlive id + char *tmp = decodedString(xml.attribute("id")); + mlt_properties_set(transproperties, "kdenlive_id", tmp); + delete[] tmp; if (currentBTrack != a_track) { mlt_properties_set_int(properties, "a_track", a_track); } @@ -2869,7 +3072,7 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int } -bool 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); @@ -2901,7 +3104,7 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, // attach filter to the clip field->plant_transition(*transition, a_track, b_track); delete[] transId; - refresh(); + if (do_refresh) refresh(); return true; } @@ -2917,7 +3120,7 @@ void Render::mltSavePlaylist() fileConsumer.start(); } -QList Render::producersList() +const QList Render::producersList() { QList prods; if (m_mltProducer == NULL) return prods; @@ -2972,6 +3175,8 @@ void Render::fillSlowMotionProducers() if (id.startsWith("slowmotion:") && !nprod->is_blank()) { // this is a slowmotion producer, add it to the list QString url = QString::fromUtf8(nprod->get("resource")); + int strobe = nprod->get_int("strobe"); + if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); if (!m_slowmotionProducers.contains(url)) { m_slowmotionProducers.insert(url, nprod); } @@ -2989,7 +3194,10 @@ void Render::mltInsertTrack(int ix, bool videoTrack) Mlt::Service service(m_mltProducer->parent().get_service()); mlt_service_lock(service.get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return; + } Mlt::Tractor tractor(service); @@ -3098,7 +3306,17 @@ void Render::mltDeleteTrack(int ix) tractor.removeChild(track); //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); setSceneList(doc.toString(), m_framePosition); - mltCheckLength(); + + /* if (m_mltProducer != NULL) { + Mlt::Producer parentProd(m_mltProducer->parent()); + if (parentProd.get_producer() != NULL) { + Mlt::Service service(parentProd.get_service()); + if (service.type() == tractor_type) { + Mlt::Tractor tractor(service); + mltCheckLength(&tractor); + } + } + }*/ } @@ -3117,9 +3335,8 @@ void Render::updatePreviewSettings() int pos = 0; if (m_mltProducer) { pos = m_mltProducer->position(); - delete m_mltProducer; } - m_mltProducer = NULL; + setSceneList(scene, pos); }