X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=1b8d03247e0a166f2bd15a8f008aaa052812c81a;hb=43146420373982a0b2c3434d71d09317f1596c09;hp=e6324a1f4d01a3201271f9a41557c1f0a67d5044;hpb=ac5f5c9f6d4bdffeb76f3f2098b80f27bc532606;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index e6324a1f..1b8d0324 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -51,6 +51,7 @@ static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl) { +// kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified(); if (level > MLT_LOG_ERROR) return; QString error; QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified())); @@ -71,14 +72,21 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr if (self->analyseAudio) { self->showAudio(frame); } - if (frame.get_double("_speed") == 0.0) { - self->emitConsumerStopped(); - } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { self->pause(); self->emitConsumerStopped(); } } + +static void consumer_paused(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; + self->emitConsumerStopped(); +} + + static void consumer_gl_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? @@ -94,7 +102,7 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ } Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) : - AbstractRender(parent), + AbstractRender(rendererName, parent), m_isBlocked(0), analyseAudio(KdenliveSettings::monitor_audio()), m_name(rendererName), @@ -126,9 +134,11 @@ Render::~Render() void Render::closeMlt() -{ +{ //delete m_osdTimer; - if (m_mltProducer) { + if (m_mltConsumer) delete m_mltConsumer; + if (m_mltProducer) delete m_mltProducer; + /*if (m_mltProducer) { Mlt::Service service(m_mltProducer->parent().get_service()); mlt_service_lock(service.get_service()); @@ -151,21 +161,14 @@ void Render::closeMlt() resource = mlt_properties_get(properties, "mlt_service"); } - for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) { - Mlt::Producer trackProducer(tractor.track(trackNb)); - Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); - } delete field; field = NULL; } mlt_service_unlock(service.get_service()); - } + }*/ kDebug() << "// // // CLOSE RENDERER " << m_name; - delete m_mltConsumer; - delete m_mltProducer; - delete m_blackClip; + if (m_blackClip) delete m_blackClip; //delete m_osdInfo; } @@ -174,20 +177,19 @@ void Render::slotSwitchFullscreen() if (m_mltConsumer) m_mltConsumer->set("full_screen", 1); } -void Render::buildConsumer(const QString profileName) +void Render::buildConsumer(const QString &profileName) { - m_activeProfile = profileName; - char *tmp = qstrdup(m_activeProfile.toUtf8().constData()); - setenv("MLT_PROFILE", tmp, 1); delete m_blackClip; m_blackClip = NULL; //TODO: uncomment following line when everything is clean // uncommented Feb 2011 --Granjow if (m_mltProfile) delete m_mltProfile; - + m_activeProfile = profileName; + char *tmp = qstrdup(m_activeProfile.toUtf8().constData()); + setenv("MLT_PROFILE", tmp, 1); m_mltProfile = new Mlt::Profile(tmp); - m_mltProfile->get_profile()->is_explicit = 1; + m_mltProfile->set_explicit(true); delete[] tmp; m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); @@ -240,6 +242,7 @@ void Render::buildConsumer(const QString profileName) m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview"); // FIXME: the event object returned by the listen gets leaked... m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused); m_mltConsumer->set("window_id", m_winid); } m_mltConsumer->set("resize", 1); @@ -274,14 +277,25 @@ void Render::buildConsumer(const QString profileName) Mlt::Producer *Render::invalidProducer(const QString &id) { - Mlt::Producer *clip = new Mlt::Producer(*m_mltProfile, "colour", "red"); + Mlt::Producer *clip; + QString txt = "+" + i18n("Missing clip") + ".txt"; + char *tmp = qstrdup(txt.toUtf8().constData()); + clip = new Mlt::Producer(*m_mltProfile, tmp); + delete[] tmp; + if (clip == NULL) clip = new Mlt::Producer(*m_mltProfile, "colour", "red"); + else { + clip->set("bgcolour", "0xff0000ff"); + clip->set("pad", "10"); + } clip->set("id", id.toUtf8().constData()); clip->set("mlt_type", "producer"); return clip; } -int Render::resetProfile(const QString profileName) +int Render::resetProfile(const QString &profileName, bool dropSceneList) { + QString scene; + if (!dropSceneList) scene = sceneList(); if (m_mltConsumer) { if (m_externalConsumer == KdenliveSettings::external_display()) { if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1; @@ -302,9 +316,9 @@ int Render::resetProfile(const QString profileName) delete m_mltConsumer; m_mltConsumer = NULL; } - QString scene = sceneList(); int pos = 0; double current_fps = m_mltProfile->fps(); + double current_dar = m_mltProfile->dar(); delete m_blackClip; m_blackClip = NULL; @@ -326,31 +340,18 @@ int Render::resetProfile(const QString profileName) m_mltProducer = NULL; buildConsumer(profileName); double new_fps = m_mltProfile->fps(); - if (current_fps != new_fps) { - // fps changed, we must update the scenelist positions - scene = updateSceneListFps(current_fps, new_fps, scene); + double new_dar = m_mltProfile->dar(); + + if (!dropSceneList) { + // We need to recover our playlist + if (current_fps != new_fps) { + // fps changed, we must update the scenelist positions + scene = updateSceneListFps(current_fps, new_fps, scene); + } + setSceneList(scene, pos); + // producers have changed (different profile), so reset them... + emit refreshDocumentProducers(new_dar != current_dar, current_fps != new_fps); } - //kDebug() << "//RESET WITHSCENE: " << scene; - setSceneList(scene, pos); - // producers have changed (different profile), so reset them... - emit refreshDocumentProducers(); - /*Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", scene.toUtf8().constData()); - m_mltProducer = producer; - m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); - m_mltProducer->optimise(); - m_mltProducer->set_speed(0); - connectPlaylist();*/ - - //delete m_mltProfile; - // mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer()); - //mlt_profile prof = m_mltProfile->get_profile(); - //mlt_properties_set_data(properties, "_profile", prof, 0, (mlt_destructor)mlt_profile_close, NULL); - //mlt_properties_set(properties, "profile", "hdv_1080_50i"); - //m_mltConsumer->set("profile", (char *) profile.toUtf8().data()); - //m_mltProfile = new Mlt::Profile((char*) profile.toUtf8().data()); - - //apply_profile_properties( m_mltProfile, m_mltConsumer->get_consumer(), properties ); - //refresh(); return 1; } @@ -553,9 +554,10 @@ void Render::slotSplitView(bool doit) } } -void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip) +void Render::getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip) { QString path; + QLocale locale; bool proxyProducer; if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") { path = xml.attribute("proxy"); @@ -566,8 +568,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int proxyProducer = false; } - - KUrl url = KUrl(path); + KUrl url(path); Mlt::Producer *producer = NULL; CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt(); //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n"; @@ -591,12 +592,14 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int play.appendChild(doc.importNode(xml, true)); producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData()); } else { - producer = new Mlt::Producer(*m_mltProfile, url.path().toUtf8().constData()); + char *resTag = qstrdup(QString("nocache:" + path).toUtf8().constData()); + producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); + delete[] resTag; } if (producer == NULL || producer->is_blank() || !producer->is_valid()) { - kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "; + kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<set("length", xml.attribute("proxy_out").toInt() + 1); producer->set("out", xml.attribute("proxy_out").toInt()); if (producer->get_out() != xml.attribute("proxy_out").toInt()) { // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip @@ -691,6 +695,10 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) { // Clip already has all properties + if (replaceProducer) emit blockClipMonitor(clipId); + // Querying a frame is required by MLT, otherwise the producer is not correctly initialised + //Mlt::Frame *frame = producer->get_frame(); + //delete frame; emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip); return; } @@ -754,7 +762,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int } if (producer->get_double("meta.media.frame_rate_den") > 0) { - filePropertyMap["fps"] = QString::number(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); + filePropertyMap["fps"] = locale.toString(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); } else filePropertyMap["fps"] = producer->get("source_fps"); if (frame && frame->is_valid()) { @@ -792,7 +800,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int } else pix.fill(Qt::black); - if (frameNumber == 0 && variance < 6) { + if (frameNumber == 0 && variance< 6) { // Thumbnail is not interesting (for example all black, seek to fetch better thumb frameNumber = 100; producer->seek(frameNumber); @@ -880,6 +888,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); + if (replaceProducer) emit blockClipMonitor(clipId); emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip); // FIXME: should delete this to avoid a leak... //delete producer; @@ -926,13 +935,18 @@ void Render::initSceneList() int Render::setProducer(Mlt::Producer *producer, int position) { + QMutexLocker locker(&m_mutex); if (m_winid == -1) return -1; - if (m_mltConsumer) { - m_mltConsumer->stop(); - } else return -1; + if (!m_mltConsumer->is_stopped()) { + m_mltConsumer->stop(); + } + m_mltConsumer->set("refresh", 0); + } + else { + return -1; + } - m_mltConsumer->purge(); m_isBlocked = true; if (m_mltProducer) { m_mltProducer->set_speed(0); @@ -940,7 +954,8 @@ int Render::setProducer(Mlt::Producer *producer, int position) m_mltProducer = NULL; emit stopped(); } - if (producer) { + blockSignals(true); + if (producer && producer->is_valid()) { m_mltProducer = new Mlt::Producer(producer->get_producer()); } else m_mltProducer = m_blackClip->cut(0, 50); @@ -951,6 +966,7 @@ int Render::setProducer(Mlt::Producer *producer, int position) int volume = KdenliveSettings::volume(); m_mltProducer->set("meta.volume", (double)volume / 100); m_fps = m_mltProducer->get_fps(); + blockSignals(false); int error = connectPlaylist(); if (position != -1) { @@ -972,7 +988,7 @@ int Render::setSceneList(QString playlist, int position) m_isBlocked = true; int error = 0; - //kDebug() << "////// RENDER, SET SCENE LIST: " << playlist; + //kDebug() << "////// RENDER, SET SCENE LIST:\n" << playlist <<"\n..........:::."; // Remove previous profile info QDomDocument doc; @@ -995,7 +1011,7 @@ int Render::setSceneList(QString playlist, int position) 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 service(m_mltProducer->parent().get_service()); mlt_service_lock(service.get_service()); if (service.type() == tractor_type) { @@ -1017,6 +1033,7 @@ int Render::setSceneList(QString playlist, int position) resource = mlt_properties_get(properties, "mlt_service"); } + for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) { Mlt::Producer trackProducer(tractor.track(trackNb)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -1024,7 +1041,7 @@ int Render::setSceneList(QString playlist, int position) } delete field; } - mlt_service_unlock(service.get_service()); + mlt_service_unlock(service.get_service());*/ qDeleteAll(m_slowmotionProducers.values()); m_slowmotionProducers.clear(); @@ -1035,11 +1052,8 @@ int Render::setSceneList(QString playlist, int position) } blockSignals(true); - // TODO: Better way to do this - if (KdenliveSettings::projectloading_avformatnovalidate()) - playlist.replace(">avformat", ">avformat-novalidate"); - else - playlist.replace(">avformat-novalidate", ">avformat"); + + m_locale = QLocale(); m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData()); if (!m_mltProducer || !m_mltProducer->is_valid()) { @@ -1134,7 +1148,6 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData) void Render::saveZone(KUrl url, QString desc, QPoint zone) { - kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name; Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData()); m_mltProducer->optimise(); xmlConsumer.set("terminate_on_pause", 1); @@ -1242,18 +1255,15 @@ void Render::slotOsdTimeout() void Render::start() { - kDebug() << "----- STARTING MONITOR: " << m_name; if (m_winid == -1) { kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART"; return; } if (m_mltConsumer && m_mltConsumer->is_stopped()) { - kDebug() << "----- MONITOR: " << m_name << " WAS STOPPED"; if (m_mltConsumer->start() == -1) { //KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it.")); kDebug(QtWarningMsg) << "/ / / / CANNOT START MONITOR"; } else { - kDebug() << "----- MONITOR: " << m_name << " REFRESH"; m_isBlocked = false; refresh(); } @@ -1265,13 +1275,12 @@ void Render::stop() { if (m_mltProducer == NULL) return; if (m_mltConsumer && !m_mltConsumer->is_stopped()) { - kDebug() << "///////////// RENDER STOPPED: " << m_name; + //kDebug() << "///////////// RENDER STOPPED: " << m_name; //m_mltConsumer->set("refresh", 0); m_mltConsumer->stop(); // delete m_mltConsumer; // m_mltConsumer = NULL; } - kDebug() << "///////////// RENDER STOP2-------"; m_isBlocked = true; if (m_mltProducer) { @@ -1280,13 +1289,10 @@ void Render::stop() //m_mltProducer->set("out", m_mltProducer->get_length() - 1); //kDebug() << m_mltProducer->get_length(); } - kDebug() << "///////////// RENDER STOP3-------"; } void Render::stop(const GenTime & startTime) { - - kDebug() << "///////////// RENDER STOP-------2"; if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); @@ -1311,36 +1317,24 @@ void Render::pause() m_mltConsumer->purge(); } -void Render::switchPlay() +void Render::switchPlay(bool play) { if (!m_mltProducer || !m_mltConsumer) return; if (m_isZoneMode) resetZoneMode(); - if (m_mltProducer->get_speed() == 0.0) { + if (play && m_mltProducer->get_speed() == 0.0) { m_isBlocked = false; if (m_name == "clip" && m_framePosition == (int) m_mltProducer->get_out()) m_mltProducer->seek(0); m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); - } else { + } else if (!play) { m_isBlocked = true; m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); //emit rendererPosition(m_framePosition); m_mltProducer->seek(m_framePosition); - m_mltConsumer->purge(); - //kDebug()<<" ********* RENDER PAUSE: "<get_speed(); - //m_mltConsumer->set("refresh", 0); - /*mlt_position position = mlt_producer_position( m_mltProducer->get_producer() ); - m_mltProducer->set_speed(0); - m_mltProducer->seek( position ); - //m_mltProducer->seek((int) m_framePosition); - m_isBlocked = false;*/ + //m_mltConsumer->purge(); } - /*if (speed == 0.0) { - m_mltProducer->seek((int) m_framePosition + 1); - m_mltConsumer->purge(); - }*/ - //refresh(); } void Render::play(double speed) @@ -1479,13 +1473,13 @@ const QString & Render::rendererName() const void Render::emitFrameUpdated(Mlt::Frame& frame) { - mlt_image_format format = mlt_image_rgb24a; + mlt_image_format format = mlt_image_rgb24; int width = 0; int height = 0; const uchar* image = frame.get_image(format, width, height); - QImage qimage(width, height, QImage::Format_ARGB32); - memcpy(qimage.bits(), image, width * height * 4); - emit frameUpdated(qimage.rgbSwapped()); + QImage qimage(width, height, QImage::Format_RGB888); + memcpy(qimage.bits(), image, width * height * 3); + emit frameUpdated(qimage); } void Render::emitFrameNumber(double position) @@ -1639,20 +1633,20 @@ void Render::mltCheckLength(Mlt::Tractor *tractor) Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element) { if (element.attribute("speed", "1.0").toDouble() == 1.0 && element.attribute("strobe", "1").toInt() == 1) return prod; - + QLocale locale; // 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)); + url.append('?' + locale.toString(speed)); if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); if (strobe > 1) slowprod->set("strobe", strobe); - QString id = prod->get("id"); + QString id = prod->parent().get("id"); if (id.contains('_')) id = id.section('_', 0, 0); - QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + QString producerid = "slowmotion:" + id + ':' + locale.toString(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); slowprod->set("id", producerid.toUtf8().constData()); m_slowmotionProducers.insert(url, slowprod); @@ -1821,7 +1815,7 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr return false; } Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(info.track)); + Mlt::Producer trackProducer(tractor.track(tractor.count() - 1 - info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int startPos = info.startPos.frames(m_fps); int clipIndex = trackPlaylist.get_clip_index_at(startPos); @@ -1879,34 +1873,21 @@ bool Render::mltRemoveClip(int track, GenTime position) kWarning() << "// TRACTOR PROBLEM"; return false; } - + //service.lock(); 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)); - // 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; - if (trackPlaylist.is_blank(i)) blk = "(blank)"; - kDebug()<<"CLIP "< trackClipStartList, QMap trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset) +void Render::mltInsertSpace(QMap trackClipStartList, QMap trackTransitionStartList, int track, const GenTime &duration, const GenTime &timeOffset) { if (!m_mltProducer) { kDebug() << "PLAYLIST NOT INITIALISED //////"; @@ -2137,6 +2118,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou 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)); @@ -2168,13 +2150,13 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou if ((serv == "avformat" || serv == "avformat-novalidate") && (speed != 1.0 || strobe > 1)) { mlt_service_lock(service.get_service()); QString url = QString::fromUtf8(clipparent.get("resource")); - url.append('?' + QString::number(speed)); + url.append('?' + m_locale.toString(speed)); if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); if (strobe > 1) slowprod->set("strobe", strobe); - QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + QString producerid = "slowmotion:" + id + ':' + m_locale.toString(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); slowprod->set("id", producerid.toUtf8().constData()); // copy producer props @@ -2247,13 +2229,13 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou mlt_service_lock(service.get_service()); QString url = QString::fromUtf8(clipparent.get("resource")); url = url.section('?', 0, 0); - url.append('?' + QString::number(speed)); + url.append('?' + m_locale.toString(speed)); if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); slowprod->set("strobe", strobe); - QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed); + QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + m_locale.toString(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); slowprod->set("id", producerid.toUtf8().constData()); // copy producer props @@ -2308,7 +2290,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou return newLength; } -bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) +bool Render::mltRemoveTrackEffect(int track, int index, bool updateIndex) { Mlt::Service service(m_mltProducer->parent().get_service()); bool success = false; @@ -2322,11 +2304,11 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) { + if ((index == -1 && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index) { if (clipService.detach(*filter) == 0) success = true; } else if (updateIndex) { // Adjust the other effects index - if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; } else ct++; filter = clipService.filter(ct); @@ -2337,7 +2319,7 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) return success; } -bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh) +bool Render::mltRemoveEffect(int track, GenTime position, int index, bool updateIndex, bool doRefresh) { if (position < GenTime()) { // Remove track effect @@ -2365,18 +2347,17 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up } delete clip; -// if (tag.startsWith("ladspa")) tag = "ladspa"; m_isBlocked = true; mlt_service_lock(service.get_service()); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) { + if ((index == -1 && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { if (clipService.detach(*filter) == 0) success = true; //kDebug()<<"Deleted filter id:"<get("kdenlive_id")<<", ix:"<get("kdenlive_ix")<<", SERVICE:"<get("mlt_service"); } else if (updateIndex) { // Adjust the other effects index - if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; } else ct++; filter = clipService.filter(ct); @@ -2476,7 +2457,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int // create filter QString tag = params.paramValue("tag"); - kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; + //kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; char *filterTag = qstrdup(tag.toUtf8().constData()); char *filterId = qstrdup(params.paramValue("id").toUtf8().constData()); QHash::Iterator it; @@ -2484,10 +2465,10 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int if (!kfr.isEmpty()) { QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts); - kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); + //kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData()); char *endtag = qstrdup(params.paramValue("endtag", "end").toUtf8().constData()); - kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; + //kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; //double max = params.paramValue("max").toDouble(); double min = params.paramValue("min").toDouble(); double factor = params.paramValue("factor", "1").toDouble(); @@ -2510,7 +2491,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int } filter->set("in", x1); //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); + filter->set(starttag, m_locale.toString((min + y1) / factor).toUtf8().data()); service.attach(*filter); } } else for (int i = 0; i < keyFrames.size() - 1; ++i) { @@ -2530,8 +2511,8 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int filter->set("in", x1); filter->set("out", x2); //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); - filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); + filter->set(starttag, m_locale.toString((min + y1) / factor).toUtf8().data()); + filter->set(endtag, m_locale.toString((min + y2) / factor).toUtf8().data()); service.attach(*filter); offset = 1; } @@ -2562,6 +2543,11 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int return false; } params.removeParam("kdenlive_id"); + if (params.hasParam("_sync_in_out")) { + // This effect must sync in / out with parent clip + params.removeParam("_sync_in_out"); + filter->set_in_and_out(service.get_int("in"), service.get_int("out")); + } for (int j = 0; j < params.count(); j++) { filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); @@ -2583,10 +2569,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int filter->set("effect", effectArgs.simplified().toUtf8().constData()); } - if (params.paramValue("id") == "pan_zoom") { - filter->set_in_and_out(service.get_int("in"), service.get_int("out") + 1); - } - // attach filter to the clip service.attach(*filter); } @@ -2652,7 +2634,7 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params) bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) { - QString index = params.paramValue("kdenlive_ix"); + int index = params.paramValue("kdenlive_ix").toInt(); QString tag = params.paramValue("tag"); if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) { @@ -2693,7 +2675,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par Mlt::Filter *filter = clip->filter(ct); while (filter) { - if (filter->get_int("kdenlive_ix") == index.toInt()) { + if (filter->get_int("kdenlive_ix") == index) { break; } ct++; @@ -2711,13 +2693,15 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par QString prefix; QString ser = filter->get("mlt_service"); if (ser == "region") prefix = "filter0."; + if (params.hasParam("_sync_in_out")) { + // This effect must sync in / out with parent clip + params.removeParam("_sync_in_out"); + filter->set_in_and_out(clip->get_in(), clip->get_out()); + } mlt_service_lock(service.get_service()); for (int j = 0; j < params.count(); j++) { filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); - } - - if (params.paramValue("id") == "pan_zoom") - filter->set_in_and_out(clip->get_in(), clip->get_out() + 1); + } delete clip; mlt_service_unlock(service.get_service()); @@ -3195,9 +3179,8 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!"; return false; } - kDebug() << "NEW PROD ID: " << prod->get("id"); m_isBlocked++; - kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; + //kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; @@ -3249,7 +3232,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn Mlt::Producer trackProducer(tractor.track(startTrack)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(moveStart); - kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex; + //kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex; bool checkLength = false; if (endTrack == startTrack) { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); @@ -3484,7 +3467,7 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b { if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); else { - kDebug()<<"// DELETING TRANS: "< map = mltGetTransitionParamsFromXml(xml); QMap::Iterator it; @@ -3580,7 +3562,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); + //kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25); while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; @@ -3618,7 +3600,7 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) map[name] = e.attribute("value"); } if (e.attribute("type") != "addedgeometry" && !e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) { - map[name] = QString::number(map.value(name).toDouble() / e.attribute("factor").toDouble()); + map[name] = m_locale.toString(map.value(name).toDouble() / e.attribute("factor").toDouble()); //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . , } @@ -3801,6 +3783,8 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, //kDebug() << " ------ ADDING TRANSITION PARAMs: " << args.count(); if (xml.hasAttribute("id")) transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData()); + if (xml.hasAttribute("force_track")) + transition->set("force_track", xml.attribute("force_track").toInt()); for (it = args.begin(); it != args.end(); ++it) { key = it.key(); @@ -3847,15 +3831,16 @@ const QList Render::producersList() delete tt; Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipNb = trackPlaylist.count(); - //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; for (int i = 0; i < clipNb; i++) { Mlt::Producer *c = trackPlaylist.get_clip(i); - Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); - if (nprod) { - if (!nprod->is_blank() && !ids.contains(nprod->get("id"))) { - ids.append(nprod->get("id")); + if (c == NULL) continue; + QString prodId = c->parent().get("id"); + if (!c->is_blank() && !ids.contains(prodId) && !prodId.startsWith("slowmotion") && !prodId.isEmpty()) { + Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); + if (nprod) { + ids.append(prodId); prods.append(nprod); - } else delete nprod; + } } delete c; } @@ -3882,7 +3867,7 @@ void Render::fillSlowMotionProducers() Mlt::Producer *c = trackPlaylist.get_clip(i); Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); if (nprod) { - QString id = nprod->get("id"); + QString id = nprod->parent().get("id"); if (id.startsWith("slowmotion:") && !nprod->is_blank()) { // this is a slowmotion producer, add it to the list QString url = QString::fromUtf8(nprod->get("resource")); @@ -4023,17 +4008,7 @@ void Render::mltDeleteTrack(int ix) tractor.removeChild(track); //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); setSceneList(doc.toString(), m_framePosition); - - /* 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); - } - } - }*/ + emit refreshDocumentProducers(false, false); }