X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=a024bdf5fffe40a0d87bc18bc33e82651244d2cc;hb=7fff167fb95bb6b13b138b8d3f7b68da8a030473;hp=6e0f198e2a0f6f082447437b2d116c2cb417c748;hpb=a6d4ef775d1459f868b03d444bfe5d1d23208291;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 6e0f198e..a024bdf5 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -28,6 +28,8 @@ extern "C" { #include } +#include + #include #include #include @@ -51,6 +53,8 @@ extern "C" { #define ENABLE_FFMPEG_CODEC_DESCRIPTION 1 #endif + + 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; @@ -61,9 +65,8 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr } } -Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(-1), m_framePosition(0), m_generateScenelist(false), m_isBlocked(true) { - kDebug() << "////////// USING PROFILE: " << (char *)KdenliveSettings::current_profile().toUtf8().data(); - m_mltProfile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data()); +Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(-1), m_framePosition(0), m_generateScenelist(false), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false) { + kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); refreshTimer = new QTimer(this); connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); @@ -73,40 +76,17 @@ Render::Render(const QString & rendererName, int winid, int extid, QWidget *pare connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout())); m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties"); - //if (rendererName == "clip") - { - //Mlt::Consumer *consumer = new Mlt::Consumer( profile , "sdl_preview"); - m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); //consumer; - m_mltConsumer->set("resize", 1); - m_mltConsumer->set("window_id", winid); - m_mltConsumer->set("terminate_on_pause", 1); - m_mltConsumer->set("rescale", "nearest"); - m_mltConsumer->set("progressive", 1); - m_mltConsumer->set("audio_buffer", 1024); - m_mltConsumer->set("frequency", 48000); - m_externalwinid = extid; - m_winid = winid; - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", ""); - m_mltProducer = producer; - m_mltConsumer->connect(*m_mltProducer); - m_mltProducer->set_speed(0.0); - - //m_mltConsumer->start(); - //refresh(); - //initSceneList(); - } - /*m_osdInfo = new Mlt::Filter("data_show"); - char *tmp = decodedString(m_osdProfile); - m_osdInfo->set("resource", tmp); - delete[] tmp;*/ - // Does it do anything usefull? I mean, RenderThread doesn't do anything useful at the moment - // (except being cpu hungry :) + buildConsumer(); - /* if(!s_renderThread) { - s_renderThread = new RenderThread; - s_renderThread->start(); - } */ + m_externalwinid = extid; + m_winid = winid; + Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_mltProducer = producer; + if (m_blackClip) delete m_blackClip; + m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_blackClip->set("id", "black"); + m_mltConsumer->connect(*m_mltProducer); + m_mltProducer->set_speed(0.0); } Render::~Render() { @@ -121,47 +101,89 @@ void Render::closeMlt() { delete m_mltConsumer; if (m_mltProducer) delete m_mltProducer; - while (! m_producersList.isEmpty()) delete m_producersList.takeFirst(); + if (m_blackClip) delete m_blackClip; //delete m_osdInfo; } +void Render::buildConsumer() { + char *tmp; + tmp = decodedString(KdenliveSettings::current_profile()); + m_mltProfile = new Mlt::Profile(tmp); + delete[] tmp; + + + QString videoDriver = KdenliveSettings::videodrivername(); + if (!videoDriver.isEmpty()) { + if (videoDriver == "x11_noaccel") { + setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1); + videoDriver = "x11"; + } else { + unsetenv("SDL_VIDEO_YUV_HWACCEL"); + } + } + + m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); + m_mltConsumer->set("resize", 1); + m_mltConsumer->set("window_id", m_winid); + m_mltConsumer->set("terminate_on_pause", 1); + m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_mltConsumer->set("rescale", "nearest"); + + QString audioDevice = KdenliveSettings::audiodevicename(); + if (!audioDevice.isEmpty()) { + tmp = decodedString(audioDevice); + m_mltConsumer->set("audio_device", tmp); + delete[] tmp; + } + + if (!videoDriver.isEmpty()) { + tmp = decodedString(videoDriver); + m_mltConsumer->set("video_driver", tmp); + delete[] tmp; + } + + QString audioDriver = KdenliveSettings::audiodrivername(); + if (!audioDriver.isEmpty()) { + tmp = decodedString(audioDriver); + m_mltConsumer->set("audio_driver", tmp); + delete[] tmp; + } -int Render::resetProfile(QString profile) { + m_mltConsumer->set("progressive", 1); + m_mltConsumer->set("audio_buffer", 1024); + m_mltConsumer->set("frequency", 48000); +} +int Render::resetProfile() { if (!m_mltConsumer) return 0; + QString currentProfile = getenv("MLT_PROFILE"); + if (currentProfile == KdenliveSettings::current_profile()) { + kDebug() << "reset to same profile, nothing to do"; + return 1; + } + if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); delete m_mltConsumer; - m_mltConsumer = NULL; QString scene = sceneList(); if (m_mltProducer) delete m_mltProducer; m_mltProducer = NULL; if (m_mltProfile) delete m_mltProfile; m_mltProfile = NULL; - - char *tmp = decodedString(profile); - m_mltProfile = new Mlt::Profile(tmp); - delete[] tmp; - m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); //consumer; - m_mltConsumer->set("resize", 1); - m_mltConsumer->set("window_id", m_winid); - m_mltConsumer->set("terminate_on_pause", 1); - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - m_mltConsumer->set("rescale", "nearest"); - m_mltConsumer->set("progressive", 1); - m_mltConsumer->set("audio_buffer", 1024); - m_mltConsumer->set("frequency", 48000); + buildConsumer(); kDebug() << "//RESET WITHSCENE: " << scene; setSceneList(scene); - tmp = decodedString(scene); + char *tmp = decodedString(scene); Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp); delete[] tmp; m_mltProducer = producer; + if (m_blackClip) delete m_blackClip; + m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); m_mltProducer->optimise(); m_mltProducer->set_speed(0); connectPlaylist(); @@ -173,7 +195,6 @@ int Render::resetProfile(QString profile) { //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()); - kDebug() << " ++++++++++ RESET CONSUMER WITH PROFILE: " << profile << ", WIDTH: " << m_mltProfile->width(); //apply_profile_properties( m_mltProfile, m_mltConsumer->get_consumer(), properties ); //refresh(); @@ -231,7 +252,7 @@ QPixmap Render::extractFrame(int frame_position, int width, int height) { pix.fill(Qt::black); return pix; } - return KThumb::getFrame(*m_mltProducer, frame_position, width, height); + return KThumb::getFrame(m_mltProducer, frame_position, width, height); } QPixmap Render::getImageThumbnail(KUrl url, int width, int height) { @@ -243,14 +264,11 @@ QPixmap Render::getImageThumbnail(KUrl url, int width, int height) { QStringList::Iterator it; QDir dir(url.directory()); - more = dir.entryList(QDir::Files); - - for (it = more.begin() ; it != more.end() ; ++it) { - if ((*it).endsWith("." + fileType, Qt::CaseInsensitive)) { - im.load(url.directory() + "/" + *it); - break; - } - } + QStringList filter; + filter << "*." + fileType; + filter << "*." + fileType.toUpper(); + more = dir.entryList(filter, QDir::Files); + im.load(url.directory() + "/" + more.at(0)); } else im.load(url.path()); //pixmap = im.scaled(width, height); return pixmap; @@ -377,43 +395,108 @@ const double Render::dar() const { return m_mltProfile->dar(); } -void Render::getFileProperties(const QDomElement &xml, int clipId) { +void Render::slotSplitView(bool doit) { + m_isSplitView = doit; + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + if (service.type() != tractor_type || tractor.count() < 2) return; + Mlt::Field *field = tractor.field(); + if (doit) { + int screen = 0; + for (int i = 1; i < tractor.count() && screen < 4; i++) { + Mlt::Producer trackProducer(tractor.track(i)); + kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide"); + if (QString(trackProducer.get("hide")).toInt() != 1) { + kDebug() << "// ADIDNG TRACK: " << i; + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "composite"); + transition->set("mlt_service", "composite"); + transition->set("a_track", 0); + transition->set("b_track", i); + transition->set("distort", 1); + transition->set("internal_added", "200"); + char *tmp; + switch (screen) { + case 0: + tmp = "0,0:50%x50%"; + break; + case 1: + tmp = "50%,0:50%x50%"; + break; + case 2: + tmp = "0,50%:50%x50%"; + break; + case 3: + tmp = "50%,50%:50%x50%"; + break; + } + transition->set("geometry", tmp); + transition->set("always_active", "1"); + field->plant_transition(*transition, 0, i); + //delete[] tmp; + screen++; + } + } + m_mltConsumer->set("refresh", 1); + } else { + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + QString added = mlt_properties_get(MLT_SERVICE_PROPERTIES(nextservice), "internal_added"); + if (added == "200") { + 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"); + m_mltConsumer->set("refresh", 1); + } + } +} + +void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { int height = 50; int width = (int)(height * m_mltProfile->dar()); QMap < QString, QString > filePropertyMap; QMap < QString, QString > metadataPropertyMap; KUrl url = KUrl(xml.attribute("resource", QString::null)); - bool newProducer = false; - - Mlt::Producer *producer = getProducerById(QString::number(clipId)); - if (producer == NULL) { - if (url.isEmpty()) { - QDomDocument doc; - QDomElement westley = doc.createElement("westley"); - QDomElement play = doc.createElement("playlist"); - doc.appendChild(westley); - westley.appendChild(play); - play.appendChild(doc.importNode(xml, true)); - char *tmp = decodedString(doc.toString()); - producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); - delete[] tmp; - } else { - char *tmp = decodedString(url.path()); - producer = new Mlt::Producer(*m_mltProfile, tmp); - delete[] tmp; - } - - if (producer->is_blank()) { - kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: "; - return; - } - m_producersList.append(producer); - newProducer = true; + Mlt::Producer *producer; + if (xml.attribute("type").toInt() == COLOR) { + char *tmp = decodedString("colour:" + xml.attribute("colour")); + producer = new Mlt::Producer(*m_mltProfile, "fezzik", tmp); + delete[] tmp; + } else if (url.isEmpty()) { + QDomDocument doc; + QDomElement westley = doc.createElement("westley"); + QDomElement play = doc.createElement("playlist"); + doc.appendChild(westley); + westley.appendChild(play); + play.appendChild(doc.importNode(xml, true)); + kDebug() << "/ / / / /CLIP XML: " << doc.toString(); + char *tmp = decodedString(doc.toString()); + producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); + delete[] tmp; + } else { + char *tmp = decodedString(url.path()); + producer = new Mlt::Producer(*m_mltProfile, tmp); + delete[] tmp; } + if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); - - + if (producer->is_blank()) { + kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: "; + emit removeInvalidClip(clipId); + return; + } + char *tmp = decodedString(clipId); + producer->set("id", tmp); + delete[] tmp; int frameNumber = xml.attribute("thumbnail", "0").toInt(); if (frameNumber != 0) producer->seek(frameNumber); mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer()); @@ -423,6 +506,29 @@ void Render::getFileProperties(const QDomElement &xml, int clipId) { //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime(); Mlt::Frame * frame = producer->get_frame(); + + if (xml.attribute("type").toInt() == SLIDESHOW) { + if (xml.hasAttribute("ttl")) producer->set("ttl", xml.attribute("ttl").toInt()); + if (xml.attribute("fade") == "1") { + // user wants a fade effect to slideshow + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma"); + if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1); + if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt()); + if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) { + char *tmp = decodedString(xml.attribute("luma_file")); + filter->set("luma.resource", tmp); + delete[] tmp; + if (xml.hasAttribute("softness")) { + int soft = xml.attribute("softness").toInt(); + filter->set("luma.softness", (double) soft / 100.0); + } + } + Mlt::Service clipService(producer->get_service()); + clipService.attach(*filter); + } + } + + filePropertyMap["fps"] = producer->get("source_fps"); if (frame && frame->is_valid()) { @@ -462,7 +568,7 @@ void Render::getFileProperties(const QDomElement &xml, int clipId) { emit replyGetImage(clipId, 0, pix, width, height); } else if (frame->get_int("test_audio") == 0) { - QPixmap pixmap(KStandardDirs::locate("appdata", "graphics/music.png")); + QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height)); emit replyGetImage(clipId, 0, pixmap, width, height); filePropertyMap["type"] = "audio"; } @@ -513,10 +619,10 @@ void Render::getFileProperties(const QDomElement &xml, int clipId) { metadataPropertyMap[ name.section(".", 0, -2)] = value; } - emit replyGetFileProperties(clipId, filePropertyMap, metadataPropertyMap); + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap); kDebug() << "REquested fuile info for: " << url.path(); if (frame) delete frame; - if (!newProducer && producer) delete producer; + //if (producer) delete producer; } /** Create the producer from the Westley QDomDocument */ @@ -555,6 +661,39 @@ void Render::initSceneList() { setSceneList(doc, 0); } #endif + + + +/** Create the producer from the Westley QDomDocument */ +void Render::setProducer(Mlt::Producer *producer, int position) { + if (m_winid == -1) return; + m_generateScenelist = true; + + if (m_mltConsumer) { + m_mltConsumer->stop(); + } else return; + + if (m_mltProducer) { + m_mltProducer->set_speed(0); + delete m_mltProducer; + m_mltProducer = NULL; + emit stopped(); + } + if (producer) m_mltProducer = new Mlt::Producer(producer->get_producer()); + else m_mltProducer = new Mlt::Producer(); + if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; + + m_fps = m_mltProducer->get_fps(); + connectPlaylist(); + if (position != -1) { + m_mltProducer->seek(position); + emit rendererPosition(position); + } + m_generateScenelist = false; +} + + + /** Create the producer from the Westley QDomDocument */ void Render::setSceneList(QDomDocument list, int position) { setSceneList(list.toString(), position); @@ -592,6 +731,9 @@ void Render::setSceneList(QString playlist, int position) { char *tmp = decodedString(playlist); m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); delete[] tmp; + if (m_blackClip) delete m_blackClip; + m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_blackClip->set("id", "black"); if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp; m_mltProducer->optimise(); @@ -657,6 +799,8 @@ void Render::saveSceneList(QString path, QDomElement kdenliveData) { delete[] tmppath; westleyConsumer.set("terminate_on_pause", 1); Mlt::Producer prod(m_mltProducer->get_producer()); + bool split = m_isSplitView; + if (split) slotSplitView(false); westleyConsumer.connect(prod); //prod.set("title", "kdenlive document"); //westleyConsumer.listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); @@ -678,6 +822,7 @@ void Render::saveSceneList(QString path, QDomElement kdenliveData) { out << doc.toString(); file.close(); } + if (split) slotSplitView(true); } @@ -691,7 +836,6 @@ void Render::connectPlaylist() { m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0); m_mltConsumer->start(); - parsePlaylistForClips(); emit durationChanged(m_mltProducer->get_playtime()); //refresh(); /* @@ -819,7 +963,7 @@ void Render::switchPlay() { if (!m_mltProducer) return; if (m_mltProducer->get_speed() == 0.0) { - m_isBlocked = false; + //m_isBlocked = false; m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); kDebug() << " ********* RENDER PLAY: " << m_mltProducer->get_speed(); @@ -827,7 +971,7 @@ void Render::switchPlay() { //m_isBlocked = true; m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); - m_isBlocked = true; + //m_isBlocked = true; m_mltProducer->seek((int) m_framePosition); //kDebug()<<" ********* RENDER PAUSE: "<get_speed(); //m_mltConsumer->set("refresh", 0); @@ -888,7 +1032,6 @@ void Render::sendSeekCommand(GenTime time) { return; //kDebug()<<"////////// KDENLIVE SEEK: "<<(int) (time.frames(m_fps)); m_mltProducer->seek((int)(time.frames(m_fps))); - m_mltConsumer->set("refresh", 1); refresh(); } @@ -896,7 +1039,6 @@ void Render::seekToFrame(int pos) { //kDebug()<<" ********* RENDER SEEK TO POS"; if (!m_mltProducer) return; - //kDebug()<<"////////// KDENLIVE SEEK: "<<(int) (time.frames(m_fps)); m_mltProducer->seek(pos); refresh(); } @@ -948,7 +1090,7 @@ const QString & Render::rendererName() const { void Render::emitFrameNumber(double position) { - if (m_generateScenelist) return; + //if (m_generateScenelist) return; m_framePosition = position; emit rendererPosition((int) position); //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId)); @@ -1044,21 +1186,21 @@ void Render::mltCheckLength(bool reload) { while (dur > 14000) { info.startPos = GenTime(i * 14000, m_fps); info.endPos = info.startPos + GenTime(13999, m_fps); - mltInsertClip(info, black); + mltInsertClip(info, black, m_blackClip); dur = dur - 14000; i++; } if (dur > 0) { info.startPos = GenTime(i * 14000, m_fps); info.endPos = info.startPos + GenTime(dur, m_fps); - mltInsertClip(info, black); + mltInsertClip(info, black, m_blackClip); } m_mltProducer->set("out", duration); emit durationChanged((int)duration); } } -void Render::mltInsertClip(ItemInfo info, QDomElement element) { +void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) { if (!m_mltProducer) { kDebug() << "PLAYLIST NOT INITIALISED //////"; return; @@ -1075,66 +1217,22 @@ void Render::mltInsertClip(ItemInfo info, QDomElement element) { Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - Mlt::Producer *prod = getProducerById(element.attribute("id")); - if (prod == NULL) { - // clip was never used yet - QDomDocument doc; - doc.appendChild(doc.importNode(element, true)); - QString resource = doc.toString(); - kDebug() << "// INSERTING CLIP: " << resource; - char *tmp = decodedString(resource); - prod = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); - delete[] tmp; - m_producersList.append(prod); - } + Mlt::Producer *clip = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1); - Mlt::Producer *clip = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps)); - trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1); + if (QString(prod->get("transparency")).toInt() == 1) + mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt()); mlt_service_unlock(service.get_service()); - if (info.track != 0) mltCheckLength(); + if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(); //tractor.multitrack()->refresh(); //tractor.refresh(); } -Mlt::Producer *Render::getProducerById(const QString &id) { - for (int i = 0; i < m_producersList.count(); i++) { - if (m_producersList.at(i)->get("id") == id) return m_producersList.at(i); - } - return NULL; -} - -void Render::parsePlaylistForClips() { - // clear current producers list - while (! m_producersList.isEmpty()) delete m_producersList.takeFirst(); - - //parse entire playlists to find all the different clips - Mlt::Producer parentProd(m_mltProducer->parent()); - if (parentProd.get_producer() == NULL) { - kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; - return; - } - Mlt::Service service(parentProd.get_service()); - if (service.type() != tractor_type) return; - Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); - for (int i = 0; i < tractor.count(); i++) { - Mlt::Producer trackProducer(tractor.track(i)); - Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - for (int j = 0; j < trackPlaylist.count(); j++) { - if (!trackPlaylist.is_blank(j)) { - Mlt::Producer *clip = trackPlaylist.get_clip(j); - if (clip) { - if (getProducerById(clip->get("id")) == NULL) - m_producersList.append(new Mlt::Producer(clip->get_parent())); - } - } - } - } -} void Render::mltCutClip(int track, GenTime position) { + m_isBlocked = true; Mlt::Service service(m_mltProducer->parent().get_service()); @@ -1143,21 +1241,75 @@ void Render::mltCutClip(int track, GenTime position) { Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - trackPlaylist.split_at((int) position.frames(m_fps)); - trackPlaylist.consolidate_blanks(0); + + + /* // Display playlist info + kDebug()<<"//////////// BEFORE"; + 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 "<get_service()); + Mlt::Service dupService(clip->get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (filter->get("kdenlive_id") != "") { + kDebug() << "++ ADDING FILTER: " << filter->get("kdenlive_id"); + Mlt::Filter *dup = new Mlt::Filter(filter->get_filter()); + dup->set("kdenlive_ix", filter->get("kdenlive_ix")); + dup->set("kdenlive_id", filter->get("kdenlive_id")); + dupService.attach(*dup); + } + ct++; + filter = clipService.filter(ct); + } + mlt_service_unlock(service.get_service()); + + /* // Display playlist info + kDebug()<<"//////////// AFTER"; + 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 "<parent().get_service()); if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; @@ -1165,11 +1317,113 @@ void Render::mltRemoveClip(int track, GenTime position) { 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"; + 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 "< clipIndex) mltCheckLength(); m_isBlocked = false; + return true; +} + +int Render::mltChangeClipSpeed(ItemInfo info, double speed, 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"; + kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(info.track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps)); + Mlt::Producer clip(trackPlaylist.get_clip(clipIndex)); + QString serv = clip.parent().get("mlt_service"); + QString id = clip.parent().get("id"); + kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service"); + if (serv == "avformat" && speed != 1.0) { + mlt_service_lock(service.get_service()); + QString url = clip.parent().get("resource"); + url.append("?" + QString::number(speed)); + Mlt::Producer *slowprod = m_slowmotionProducers.value(url); + if (!slowprod || slowprod->get_producer() == NULL) { + char *tmp = decodedString(url); + slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); + delete[] tmp; + QString producerid = "slowmotion:" + id + ":" + QString::number(speed); + tmp = decodedString(producerid); + slowprod->set("id", tmp); + delete[] tmp; + m_slowmotionProducers.insert(url, slowprod); + } + Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + newLength = cut->get_length(); + trackPlaylist.replace_with_blank(clipIndex); + trackPlaylist.consolidate_blanks(0); + trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + mlt_service_unlock(service.get_service()); + } else if (speed == 1.0) { + mlt_service_lock(service.get_service()); + Mlt::Producer *cut = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + trackPlaylist.replace_with_blank(clipIndex); + newLength = cut->get_length(); + trackPlaylist.consolidate_blanks(0); + trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + mlt_service_unlock(service.get_service()); + } else if (serv == "framebuffer") { + mlt_service_lock(service.get_service()); + QString url = clip.parent().get("resource"); + url = url.section("?", 0, 0); + url.append("?" + QString::number(speed)); + Mlt::Producer *slowprod = m_slowmotionProducers.value(url); + if (!slowprod || slowprod->get_producer() == NULL) { + char *tmp = decodedString(url); + slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); + delete[] tmp; + QString producerid = "slowmotion:" + id.section(":", 1, 1) + ":" + QString::number(speed); + tmp = decodedString(producerid); + slowprod->set("id", tmp); + delete[] tmp; + m_slowmotionProducers.insert(url, slowprod); + } + Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + newLength = cut->get_length(); + trackPlaylist.replace_with_blank(clipIndex); + trackPlaylist.consolidate_blanks(0); + trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + mlt_service_unlock(service.get_service()); + kDebug() << "AVFORMAT CLIP!!!:"; + } + + m_isBlocked = false; + return newLength; } bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) { @@ -1191,7 +1445,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool do int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if (index == "-1" || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { + if ((index == "-1" && filter->get("kdenlive_id") != "") || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { if (clipService.detach(*filter) == 0) success = true; kDebug() << " / / / DLEETED EFFECT: " << ct; } else ct++; @@ -1203,7 +1457,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool do } -bool Render::mltAddEffect(int track, GenTime position, QMap args, bool doRefresh) { +bool Render::mltAddEffect(int track, GenTime position, QHash args, bool doRefresh) { Mlt::Service service(m_mltProducer->parent().get_service()); @@ -1223,7 +1477,7 @@ bool Render::mltAddEffect(int track, GenTime position, QMap a if (tag.startsWith("ladspa")) tag = "ladspa"; char *filterTag = decodedString(tag); char *filterId = decodedString(args.value("id")); - QMap::Iterator it; + QHash::Iterator it; QString kfr = args.value("keyframes"); if (!kfr.isEmpty()) { @@ -1296,10 +1550,10 @@ bool Render::mltAddEffect(int track, GenTime position, QMap a return true; } -bool Render::mltEditEffect(int track, GenTime position, QMap args) { +bool Render::mltEditEffect(int track, GenTime position, QHash args) { QString index = args.value("kdenlive_ix"); QString tag = args.value("tag"); - QMap::Iterator it = args.begin(); + QHash::Iterator it = args.begin(); if (!args.value("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); @@ -1438,37 +1692,81 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) refresh(); } -void Render::mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out) { +bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) { m_isBlocked = true; Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - if (trackPlaylist.is_blank_at((int) pos.frames(m_fps) + 1)) - kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; - int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) + 1); - int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; - int newDuration = (int) out.frames(m_fps) - 1; + /* // Display playlist info + kDebug()<<"//////////// BEFORE RESIZE"; + 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 "<get_in(); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; + int newDuration = (int) clipDuration.frames(m_fps) - 1; + trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart); + //trackPlaylist.consolidate_blanks(0); + // skip to next clip + clipIndex++; + int diff = newDuration - previousDuration; + kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration; + if (diff > 0) { // clip was made longer, trim next blank if there is one. - if (trackPlaylist.is_blank(clipIndex + 1)) { - trackPlaylist.split(clipIndex + 1, newDuration - previousDuration); - trackPlaylist.remove(clipIndex + 1); + if (trackPlaylist.is_blank(clipIndex)) { + int blankStart = trackPlaylist.clip_start(clipIndex); + int blankDuration = trackPlaylist.clip_length(clipIndex) - 1; + if (diff - blankDuration == 1) { + trackPlaylist.remove(clipIndex); + } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff); + } else { + kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; } - } else trackPlaylist.insert_blank(clipIndex + 1, previousDuration - newDuration - 1); + } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); trackPlaylist.consolidate_blanks(0); - tractor.multitrack()->refresh(); - tractor.refresh(); - if (track != 0) mltCheckLength(); + + /* // Display playlist info + kDebug()<<"//////////// AFTER RESIZE"; + 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 "<refresh(); + //tractor.refresh(); + if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(); + 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()); + ItemInfo transpinfo; + transpinfo.startPos = info.startPos; + transpinfo.endPos = info.startPos + clipDuration; + transpinfo.track = info.track; + mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt()); + } m_isBlocked = false; + return true; } void Render::mltChangeTrackState(int track, bool mute, bool blind) { @@ -1489,35 +1787,60 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) { refresh(); } -void Render::mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out) { - m_isBlocked = true; - +bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { + //kDebug() << "//////// RSIZING CLIP from: "<parent().get_service()); - - int moveFrame = (int)(moveEnd - moveStart).frames(m_fps); - + int moveFrame = (int) diff.frames(m_fps); Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - if (trackPlaylist.is_blank_at((int) pos.frames(m_fps) - 1)) + if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) { kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; - int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) - 1); - kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25); - - trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), (int) out.frames(m_fps)); + return false; + } + mlt_service_lock(service.get_service()); + int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); + /*int previousStart = trackPlaylist.clip_start(clipIndex); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/ + //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + if (clip == NULL) { + kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; + mlt_service_unlock(service.get_service()); + return false; + } + //m_mltConsumer->set("refresh", 0); + int previousStart = clip->get_in(); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; + m_isBlocked = true; + kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame; + trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration); if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1); else { - int midpos = (int)moveStart.frames(m_fps) - 1; //+ (moveFrame / 2) - int blankIndex = trackPlaylist.get_clip_index_at(midpos); + //int midpos = info.startPos.frames(m_fps) + moveFrame - 1; + int blankIndex = clipIndex - 1; int blankLength = trackPlaylist.clip_length(blankIndex); - - kDebug() << " + resizing blank: " << blankIndex << ", Mid: " << midpos << ", Length: " << blankLength << ", SIZE DIFF: " << moveFrame; - + kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame; + if (! trackPlaylist.is_blank(blankIndex)) { + kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK"; + } if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex); else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1); } trackPlaylist.consolidate_blanks(0); + if (QString(clip->parent().get("transparency")).toInt() == 1) { + //mltResizeTransparency(previousStart, (int) moveEnd.frames(m_fps), (int) (moveEnd + out - in).frames(m_fps), track, QString(clip->parent().get("id")).toInt()); + mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt()); + ItemInfo transpinfo; + transpinfo.startPos = info.startPos + diff; + transpinfo.endPos = info.startPos + diff + (info.endPos - info.startPos); + transpinfo.track = info.track; + mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt()); + } m_isBlocked = false; + //m_mltConsumer->set("refresh", 1); + mlt_service_unlock(service.get_service()); + return true; } bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) { @@ -1537,20 +1860,26 @@ 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 + 1); - + kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex; + bool checkLength = false; if (endTrack == startTrack) { //mlt_service_lock(service.get_service()); Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); - trackPlaylist.consolidate_blanks(0); + if (!trackPlaylist.is_blank_at(moveEnd)) { // error, destination is not empty //int ix = trackPlaylist.get_clip_index_at(moveEnd); + kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked = false; return false; } else { - trackPlaylist.insert_at(moveEnd, clipProducer, 1); trackPlaylist.consolidate_blanks(0); + int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); + if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { + mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); + } + if (newIndex + 1 == trackPlaylist.count()) checkLength = true; } //mlt_service_unlock(service.get_service()); } else { @@ -1565,11 +1894,18 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); trackPlaylist.consolidate_blanks(0); destTrackPlaylist.consolidate_blanks(1); - destTrackPlaylist.insert_at(moveEnd, clipProducer, 1); + int newIndex = destTrackPlaylist.insert_at(moveEnd, clipProducer, 1); destTrackPlaylist.consolidate_blanks(0); + if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { + kDebug() << "//////// moving clip transparency"; + mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); + } + if (clipIndex > trackPlaylist.count()) checkLength = true; + else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true; } } - mltCheckLength(); + + if (checkLength) mltCheckLength(); mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked = false; m_mltConsumer->set("refresh", 1); @@ -1761,10 +2097,144 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) { return map; } -void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { - QMap args = mltGetTransitionParamsFromXml(xml); +void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id) { + kDebug() << "///////// ADDING CLIP TRANSPARENCY AT: " << info.startPos.frames(25); + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "composite"); + transition->set_in_and_out((int) info.startPos.frames(m_fps), (int) info.endPos.frames(m_fps) - 1); + transition->set("transparency", id); + transition->set("fill", 1); + transition->set("internal_added", 237); + field->plant_transition(*transition, transitiontrack, info.track); + refresh(); +} + +void Render::mltDeleteTransparency(int pos, int track, int id) { + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + + //if (do_refresh) m_mltConsumer->set("refresh", 0); + mlt_service serv = m_mltProducer->parent().get_service(); + + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentTrack = mlt_transition_get_b_track(tr); + int currentIn = (int) mlt_transition_get_in(tr); + int currentOut = (int) mlt_transition_get_out(tr); + int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); + kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack; + + if (resource == "composite" && track == currentTrack && currentIn == pos && transitionId == id) { + //kDebug() << " / / / / /DELETE TRANS DOOOMNE"; + mlt_field_disconnect_service(field->get_field(), nextservice); + break; + } + 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"); + } + //if (do_refresh) m_mltConsumer->set("refresh", 1); +} + +void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id) { + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + + mlt_service_lock(service.get_service()); + m_mltConsumer->set("refresh", 0); + m_isBlocked = true; + + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << "x" << newEnd << ", " << track << ", " << id; + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentTrack = mlt_transition_get_b_track(tr); + int currentIn = (int) mlt_transition_get_in(tr); + //mlt_properties props = MLT_TRANSITION_PROPERTIES(tr); + int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); + kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << "x" << transitionId ; + if (resource == "composite" && track == currentTrack && currentIn == oldStart && transitionId == id) { + kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << "x" << newEnd; + mlt_transition_set_in_and_out(tr, newStart, newEnd); + break; + } + 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"); + } + m_isBlocked = false; + mlt_service_unlock(service.get_service()); + m_mltConsumer->set("refresh", 1); + +} + +void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id) { + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + + mlt_service_lock(service.get_service()); + m_mltConsumer->set("refresh", 0); + m_isBlocked = true; + + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentTrack = mlt_transition_get_b_track(tr); + int currentaTrack = mlt_transition_get_a_track(tr); + int currentIn = (int) mlt_transition_get_in(tr); + int currentOut = (int) mlt_transition_get_out(tr); + //mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr); + int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); + //kDebug()<<" + TRANSITION "<set("refresh", 1); +} +void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { + + QMap args = mltGetTransitionParamsFromXml(xml); Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); @@ -1772,7 +2242,8 @@ void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, char *transId = decodedString(tag); Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId); - transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps)); + if (out != GenTime()) + transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps)); QMap::Iterator it; QString key;