X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=908472ed2bbeb0a11fb386e7547c7144a1f349e9;hb=6f8f092f36ef2a23f4d4cf44f75a48f219fcecc6;hp=f66f0f9815463d57be1e01bb0c81c17c1292591a;hpb=a8c5033305785361d6af671ad4f2e66af435fe19;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index f66f0f98..908472ed 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -56,34 +56,40 @@ 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)); } } -Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) : +Render::Render(const QString & rendererName, int winid, int /* extid */, QString profile, QWidget *parent) : QObject(parent), m_isBlocked(0), 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(); - /*if (rendererName == "project") m_monitorId = 10000; else m_monitorId = 10001;*/ /*m_osdTimer = new QTimer(this); connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/ - - buildConsumer(); + if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + buildConsumer(profile); m_mltProducer = m_blackClip->cut(0, 50); m_mltConsumer->connect(*m_mltProducer); @@ -100,21 +106,42 @@ Render::~Render() void Render::closeMlt() { //delete m_osdTimer; + if (m_mltProducer) { + Mlt::Service service(m_mltProducer->parent().get_service()); + mlt_service_lock(service.get_service()); - Mlt::Service service(m_mltProducer->get_service()); - if (service.type() == tractor_type) { - Mlt::Tractor tractor(service); - int trackNb = tractor.count(); + 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_service nextservicetodisconnect; + 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") { + nextservicetodisconnect = nextservice; + nextservice = mlt_service_producer(nextservice); + mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); + 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"); + } - while (trackNb > 1) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); - Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - trackPlaylist.clear(); - trackNb--; + 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"; + kDebug() << "// // // CLOSE RENDERER " << m_name; delete m_mltConsumer; delete m_mltProducer; delete m_blackClip; @@ -122,15 +149,17 @@ void Render::closeMlt() } -void Render::buildConsumer() +void Render::buildConsumer(const QString profileName) { char *tmp; - m_activeProfile = KdenliveSettings::current_profile(); + m_activeProfile = profileName; tmp = decodedString(m_activeProfile); setenv("MLT_PROFILE", tmp, 1); 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; @@ -145,7 +174,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); @@ -195,14 +230,14 @@ void Render::buildConsumer() } -int Render::resetProfile() +int Render::resetProfile(const QString profileName) { if (!m_mltConsumer) return 0; - if (m_activeProfile == KdenliveSettings::current_profile()) { + if (m_activeProfile == profileName) { kDebug() << "reset to same profile, nothing to do"; return 1; } - kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << KdenliveSettings::current_profile(); + kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << profileName; //KdenliveSettings::current_profile(); if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); @@ -210,21 +245,39 @@ int Render::resetProfile() m_mltConsumer = NULL; QString scene = sceneList(); int pos = 0; + double current_fps = m_mltProfile->fps(); + 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(); - + 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); + } //kDebug() << "//RESET WITHSCENE: " << scene; setSceneList(scene, pos); - + // producers have changed (different profile), so reset them... + emit refreshDocumentProducers(); /*char *tmp = decodedString(scene); Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp); delete[] tmp; @@ -295,14 +348,15 @@ int Render::renderHeight() const return m_mltProfile->height(); } -QPixmap Render::extractFrame(int frame_position, int width, int height) +QImage Render::extractFrame(int frame_position, int width, int height) { if (width == -1) { width = renderWidth(); height = renderHeight(); } else if (width % 2 == 1) width++; - QPixmap pix(width, height); + if (!m_mltProducer) { + QImage pix(width, height, QImage::Format_RGB32); pix.fill(Qt::black); return pix; } @@ -520,10 +574,11 @@ 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; + //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; @@ -587,6 +642,12 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo producer->set("id", tmp); delete[] tmp; + if (xml.hasAttribute("templatetext")) { + char *tmp = decodedString(xml.attribute("templatetext")); + producer->set("templatetext", tmp); + delete[] tmp; + } + if (!replaceProducer && xml.hasAttribute("file_hash")) { // Clip already has all properties emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); @@ -818,7 +879,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(); @@ -844,8 +908,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; @@ -857,13 +919,50 @@ 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_service nextservicetodisconnect; + 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") { + nextservicetodisconnect = nextservice; + nextservice = mlt_service_producer(nextservice); + mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); + 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--; + } + delete field; + } + mlt_service_unlock(service.get_service()); + + qDeleteAll(m_slowmotionProducers.values()); + m_slowmotionProducers.clear(); + delete m_mltProducer; m_mltProducer = NULL; emit stopped(); @@ -916,7 +1015,7 @@ int Render::setSceneList(QString playlist, int position) m_isBlocked = false; blockSignals(false); - emit refreshDocumentProducers(); + return error; //kDebug()<<"// SETSCN LST, POS: "<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; @@ -1290,7 +1372,11 @@ void Render::setDropFrames(bool show) int dropFrames = 1; if (show == false) dropFrames = 0; m_mltConsumer->stop(); +#ifdef Q_WS_MAC + m_mltConsumer->set("real_time", dropFrames); +#else m_mltConsumer->set("play.real_time", dropFrames); +#endif if (m_mltConsumer->start() == -1) { emit blockMonitors(); delete m_mltProducer; @@ -1378,72 +1464,100 @@ 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()) { + if (blackclip && blackclip->is_blank()) { + delete blackclip; + blackclip = NULL; + } + + if (blackclip == NULL || blackTrackPlaylist.count() != 1) { + blackTrackPlaylist.clear(); m_blackClip->set("length", duration); m_blackClip->set("out", duration - 1); - if (blackclip) blackclip->set("length", duration); + 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); } - if (blackclip == NULL || blackclip->is_blank() || blackTrackPlaylist.count() != 1) { - blackTrackPlaylist.clear(); - blackTrackPlaylist.append(*m_blackClip, 0, duration - 1); - } else blackTrackPlaylist.resize_clip(0, 0, duration - 1); + delete blackclip; m_mltProducer->set("out", duration); emit durationChanged(duration); } } -void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) +int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) { if (m_mltProducer == NULL) { kDebug() << "PLAYLIST NOT INITIALISED //////"; - return; + return -1; + } + if (prod == NULL) { + kDebug() << "Cannot insert clip without producer //////"; + 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)); @@ -1481,11 +1595,11 @@ void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pr /*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; } @@ -1495,7 +1609,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)); @@ -1569,18 +1686,58 @@ void Render::mltCutClip(int track, GenTime position) m_isBlocked = false; } -void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) +bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) { // TODO: optimize - mltRemoveClip(info.track, info.startPos); - mltInsertClip(info, element, prod); + if (prod == NULL) { + kDebug() << "Cannot update clip with null producer //////"; + return false; + } + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(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); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + + // keep effects + QList filtersList; + Mlt::Service sourceService(clip->get_service()); + int ct = 0; + Mlt::Filter *filter = sourceService.filter(ct); + while (filter) { + if (filter->get("kdenlive_ix") != 0) { + filtersList.append(filter); + } + ct++; + filter = sourceService.filter(ct); + } + if (!mltRemoveClip(info.track, info.startPos)) return false; + if (mltInsertClip(info, element, prod) == -1) return false; + if (!filtersList.isEmpty()) { + clipIndex = trackPlaylist.get_clip_index_at(startPos); + Mlt::Producer *destclip = trackPlaylist.get_clip(clipIndex); + Mlt::Service destService(destclip->get_service()); + delete destclip; + for (int i = 0; i < filtersList.count(); i++) + destService.attach(*(filtersList.at(i))); + } + return true; } 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()); @@ -1605,7 +1762,7 @@ bool Render::mltRemoveClip(int track, GenTime position) //kDebug()<<"//// Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------"; m_isBlocked = true; Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); - delete clip; + 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());*/ @@ -1620,7 +1777,7 @@ bool Render::mltRemoveClip(int track, GenTime position) kDebug()<<"CLIP "<parent()); if (parentProd.get_producer() == NULL) { kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; - return -1; + return 0; } Mlt::Service service(parentProd.get_service()); @@ -1644,7 +1801,11 @@ int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(insertPos); - if (!trackPlaylist.is_blank(clipIndex)) return -1; + if (clipIndex == trackPlaylist.count()) { + // We are after the end of the playlist + return -1; + } + if (!trackPlaylist.is_blank(clipIndex)) return 0; if (fromBlankStart) return trackPlaylist.clip_length(clipIndex); return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos; } @@ -1697,16 +1858,19 @@ void Render::mltInsertSpace(QMap 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); int blankDuration = trackPlaylist.clip_length(clipIndex); diff = -diff; - if (blankDuration - diff == 0) + if (blankDuration - diff == 0) { trackPlaylist.remove(clipIndex); - else trackPlaylist.remove_region(position, diff); + } else trackPlaylist.remove_region(position, diff); } trackPlaylist.consolidate_blanks(0); } @@ -1758,15 +1922,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); int blankDuration = trackPlaylist.clip_length(clipIndex); - if (diff + blankDuration == 0) + if (diff + blankDuration == 0) { trackPlaylist.remove(clipIndex); - else trackPlaylist.remove_region(position, - diff); + } else trackPlaylist.remove_region(position, - diff); } trackPlaylist.consolidate_blanks(0); } @@ -1799,13 +1968,14 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap } } mlt_service_unlock(service.get_service()); - mltCheckLength(); + mltCheckLength(&tractor); m_mltConsumer->set("refresh", 1); } void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) { + if (source == dest) return; Mlt::Service sourceService(source->get_service()); Mlt::Service destService(dest->get_service()); @@ -1821,12 +1991,15 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) } } -int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int strobe, Mlt::Producer *prod) +int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, 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)); @@ -1835,21 +2008,22 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int int clipIndex = trackPlaylist.get_clip_index_at(startPos); int clipLength = trackPlaylist.clip_length(clipIndex); - Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); - if (clip == NULL) { + Mlt::Producer *original = trackPlaylist.get_clip(clipIndex); + if (original == NULL) { return -1; } - if (!clip->is_valid() || clip->is_blank()) { + if (!original->is_valid() || original->is_blank()) { // invalid clip - delete clip; + delete original; return -1; } - Mlt::Producer clipparent = clip->parent(); + Mlt::Producer clipparent = original->parent(); if (!clipparent.is_valid() || clipparent.is_blank()) { // invalid clip - delete clip; + delete original; return -1; } + delete original; QString serv = clipparent.get("mlt_service"); QString id = clipparent.get("id"); @@ -1861,8 +2035,8 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int 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); + char *tmp = decodedString("framebuffer:" + url); + slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp); if (strobe > 1) slowprod->set("strobe", strobe); delete[] tmp; QString producerid = "slowmotion:" + id + ':' + QString::number(speed); @@ -1873,8 +2047,8 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); - delete clip; trackPlaylist.consolidate_blanks(0); + // Check that the blank space is long enough for our new duration clipIndex = trackPlaylist.get_clip_index_at(startPos); int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); @@ -1886,9 +2060,9 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int // move all effects to the correct producer mltPasteEffects(clip, cut); - 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()); @@ -1896,7 +2070,6 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int mlt_service_lock(service.get_service()); Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); - delete clip; trackPlaylist.consolidate_blanks(0); // Check that the blank space is long enough for our new duration @@ -1904,18 +2077,18 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); Mlt::Producer *cut; - GenTime oldDuration = GenTime(clipLength, m_fps); - GenTime newDuration = oldDuration * oldspeed; - if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) { + int originalStart = (int)(speedIndependantInfo.cropStart.frames(m_fps)); + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + speedIndependantInfo.cropDuration).frames(m_fps) > blankEnd) { GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; - cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)(info.cropStart.frames(m_fps) + maxLength.frames(m_fps) - 1)); - } else cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)((info.cropStart + newDuration).frames(m_fps)) - 1); + cut = prod->cut(originalStart, (int)(originalStart + maxLength.frames(m_fps) - 1)); + } else cut = prod->cut(originalStart, (int)(originalStart + speedIndependantInfo.cropDuration.frames(m_fps)) - 1); // move all effects to the correct producer mltPasteEffects(clip, cut); 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()); @@ -1928,8 +2101,8 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int 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); + char *tmp = decodedString("framebuffer:" + url); + slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp); delete[] tmp; slowprod->set("strobe", strobe); QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed); @@ -1940,35 +2113,34 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); - delete clip; trackPlaylist.consolidate_blanks(0); - GenTime oldDuration = GenTime(clipLength, m_fps); - GenTime newDuration = oldDuration * (oldspeed / speed); + GenTime duration = speedIndependantInfo.cropDuration / speed; + int originalStart = (int)(speedIndependantInfo.cropStart.frames(m_fps) / speed); // Check that the blank space is long enough for our new duration clipIndex = trackPlaylist.get_clip_index_at(startPos); int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); Mlt::Producer *cut; - if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) { + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + duration).frames(m_fps) > blankEnd) { GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; - 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)); + cut = slowprod->cut(originalStart, (int)(originalStart + maxLength.frames(m_fps) - 1)); + } else cut = slowprod->cut(originalStart, (int)(originalStart + duration.frames(m_fps)) - 1); // move all effects to the correct producer mltPasteEffects(clip, cut); 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()); } - delete clip; - if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(); + if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor); m_isBlocked = false; return newLength; } @@ -2024,14 +2196,46 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para } Mlt::Service clipService(clip->get_service()); m_isBlocked = true; + int duration = clip->get_playtime(); + bool updateIndex = false; delete clip; - // temporarily remove all effects after insert point - QList filtersList; + const int filter_ix = params.paramValue("kdenlive_ix").toInt(); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() > filter_ix) { + if (QString(filter->get("kdenlive_ix")).toInt() == filter_ix) { + // A filter at that position already existed, so we will increase all indexes later + updateIndex = true; + break; + } + ct++; + filter = clipService.filter(ct); + } + + if (params.paramValue("id") == "speed") { + // special case, speed effect is not really inserted, we just update the other effects index (kdenlive_ix) + ct = 0; + filter = clipService.filter(ct); + while (filter) { + if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { + if (updateIndex) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + } + ct++; + filter = clipService.filter(ct); + } + m_isBlocked = false; + if (doRefresh) refresh(); + return true; + } + + + // temporarily remove all effects after insert point + QList filtersList; + ct = 0; + filter = clipService.filter(ct); + while (filter) { + if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { filtersList.append(filter); clipService.detach(*filter); } else ct++; @@ -2053,7 +2257,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(); @@ -2139,9 +2342,11 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para // re-add following filters for (int i = 0; i < filtersList.count(); i++) { - clipService.attach(*(filtersList.at(i))); + Mlt::Filter *filter = filtersList.at(i); + if (updateIndex) + filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + clipService.attach(*filter); } - m_isBlocked = false; if (doRefresh) refresh(); return true; @@ -2176,6 +2381,19 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par m_isBlocked = true; int ct = 0; Mlt::Filter *filter = clipService.filter(ct); + + /* + kDebug() << "EDITING FILTER: "<get("kdenlive_id") <<", IX: "<get("kdenlive_ix"); + ct++; + filter = clipService.filter(ct); + } + kDebug() << "++++++++++++++++++++++++++"; + */ + ct = 0; + filter = clipService.filter(ct); while (filter) { if (filter->get("kdenlive_ix") == index) { break; @@ -2185,24 +2403,10 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par } if (!filter) { - kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT!!!!!"; + kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT! " << index << ", " << tag; // filter was not found, it was probably a disabled filter, so add it to the correct place... - int ct = 0; - filter = clipService.filter(ct); - QList filtersList; - while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) { - filtersList.append(filter); - clipService.detach(*filter); - } else ct++; - filter = clipService.filter(ct); - } - bool success = mltAddEffect(track, position, params); - - for (int i = 0; i < filtersList.count(); i++) { - clipService.attach(*(filtersList.at(i))); - } + bool success = mltAddEffect(track, position, params); m_isBlocked = false; return success; } @@ -2221,6 +2425,38 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par return true; } +void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos) +{ + + kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos; + Mlt::Service service(m_mltProducer->parent().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(position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + if (!clip) { + kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); + return; + } + Mlt::Service clipService(clip->get_service()); + delete clip; + m_isBlocked = true; + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + int pos = QString(filter->get("kdenlive_ix")).toInt(); + if (pos == oldPos) { + filter->set("kdenlive_ix", newPos); + } else ct++; + filter = clipService.filter(ct); + } + + m_isBlocked = false; + refresh(); +} + void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) { @@ -2326,6 +2562,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()) { @@ -2345,7 +2582,9 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) if (trackPlaylist.is_blank(clipIndex)) { int blankStart = trackPlaylist.clip_start(clipIndex); 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) { + 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); @@ -2357,7 +2596,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()); @@ -2483,33 +2722,36 @@ bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTim } -void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) +bool 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; + return false; } 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 false; + } + 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); + int clipIndex = trackPlaylist.get_clip_index_at(pos); Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (clipProducer->is_blank()) { + if (clipProducer == NULL || clipProducer->is_blank()) { kDebug() << "// ERROR UPDATING CLIP PROD"; delete clipProducer; mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked--; - return; + return false; } Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); - + if (!clip) return false; // move all effects to the correct producer mltPasteEffects(clipProducer, clip); trackPlaylist.insert_at(pos, clip, 1); @@ -2517,6 +2759,7 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) delete clipProducer; mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked--; + return true; } bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod) @@ -2524,7 +2767,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()); @@ -2535,10 +2781,10 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn bool checkLength = false; if (endTrack == startTrack) { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer->is_blank()) { + if (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || clipProducer->is_blank()) { // error, destination is not empty if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1); - delete clipProducer; + if (clipProducer) delete clipProducer; //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); @@ -2564,10 +2810,10 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn return false; } else { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (clipProducer->is_blank()) { + if (!clipProducer || clipProducer->is_blank()) { // error, destination is not empty //int ix = trackPlaylist.get_clip_index_at(moveEnd); - delete clipProducer; + if (clipProducer) delete clipProducer; kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); m_isBlocked--; @@ -2595,9 +2841,14 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn mltPasteEffects(clipProducer, clip); int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1); - delete clip; - clip = NULL; - if (clipProducer) delete clipProducer; + + 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"; @@ -2608,7 +2859,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); @@ -3001,7 +3252,7 @@ void Render::mltSavePlaylist() fileConsumer.start(); } -QList Render::producersList() +const QList Render::producersList() { QList prods; if (m_mltProducer == NULL) return prods; @@ -3075,7 +3326,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); @@ -3184,7 +3438,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); + } + } + }*/ } @@ -3203,11 +3467,105 @@ void Render::updatePreviewSettings() int pos = 0; if (m_mltProducer) { pos = m_mltProducer->position(); - delete m_mltProducer; } - m_mltProducer = NULL; + setSceneList(scene, pos); } + +QString Render::updateSceneListFps(double current_fps, double new_fps, QString scene) +{ + // Update all frame positions to the new fps value + //WARNING: there are probably some effects or other that hold a frame value + // as parameter and will also need to be updated here! + QDomDocument doc; + doc.setContent(scene); + + double factor = new_fps / current_fps; + QDomNodeList producers = doc.elementsByTagName("producer"); + for (int i = 0; i < producers.count(); i++) { + QDomElement prod = producers.at(i).toElement(); + prod.removeAttribute("in"); + prod.removeAttribute("out"); + + QDomNodeList props = prod.childNodes(); + for (int j = 0; j < props.count(); j++) { + QDomElement param = props.at(j).toElement(); + QString paramName = param.attribute("name"); + if (paramName.startsWith("meta.") || paramName == "length") { + prod.removeChild(props.at(j)); + j--; + } + } + } + + QDomNodeList entries = doc.elementsByTagName("entry"); + for (int i = 0; i < entries.count(); i++) { + QDomElement entry = entries.at(i).toElement(); + int in = entry.attribute("in").toInt(); + int out = entry.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + entry.setAttribute("in", in); + entry.setAttribute("out", out); + } + + QDomNodeList blanks = doc.elementsByTagName("blank"); + for (int i = 0; i < blanks.count(); i++) { + QDomElement blank = blanks.at(i).toElement(); + int length = blank.attribute("length").toInt(); + length = factor * length + 0.5; + blank.setAttribute("length", QString::number(length)); + } + + QDomNodeList filters = doc.elementsByTagName("filter"); + for (int i = 0; i < filters.count(); i++) { + QDomElement filter = filters.at(i).toElement(); + int in = filter.attribute("in").toInt(); + int out = filter.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + filter.setAttribute("in", in); + filter.setAttribute("out", out); + } + + QDomNodeList transitions = doc.elementsByTagName("transition"); + for (int i = 0; i < transitions.count(); i++) { + QDomElement transition = transitions.at(i).toElement(); + int in = transition.attribute("in").toInt(); + int out = transition.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + transition.setAttribute("in", in); + transition.setAttribute("out", out); + QDomNodeList props = transition.childNodes(); + for (int j = 0; j < props.count(); j++) { + QDomElement param = props.at(j).toElement(); + QString paramName = param.attribute("name"); + if (paramName == "geometry") { + QString geom = param.firstChild().nodeValue(); + QStringList keys = geom.split(';'); + QStringList newKeys; + for (int k = 0; k < keys.size(); ++k) { + if (keys.at(k).contains('=')) { + int pos = keys.at(k).section('=', 0, 0).toInt(); + pos = factor * pos + 0.5; + newKeys.append(QString::number(pos) + '=' + keys.at(k).section('=', 1)); + } else newKeys.append(keys.at(k)); + } + param.firstChild().setNodeValue(newKeys.join(";")); + } + } + } + QDomElement tractor = doc.elementsByTagName("tractor").at(0).toElement(); + int out = tractor.attribute("out").toInt(); + out = factor * out + 0.5; + tractor.setAttribute("out", out); + emit durationChanged(out); + + //kDebug() << "///////////////////////////// " << out << " \n" << doc.toString() << "\n-------------------------"; + return doc.toString(); +} + #include "renderer.moc"