X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=444fcc7078746d15fdede1dff9f6c921efe7ff6d;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=4971ce0f9a307fb687aa8c9d2c9aba2496882348;hpb=b01ea4492797423d21852d87ee942bb4b15783b6;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 4971ce0f..444fcc70 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -132,7 +132,8 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi { qRegisterMetaType ("stringMap"); analyseAudio = KdenliveSettings::monitor_audio(); - if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + if (profile.isEmpty()) + profile = KdenliveSettings::current_profile(); buildConsumer(profile); m_mltProducer = m_blackClip->cut(0, 1); m_mltConsumer->connect(*m_mltProducer); @@ -157,10 +158,10 @@ void Render::closeMlt() //delete m_osdTimer; m_requestList.clear(); m_infoThread.waitForFinished(); - if (m_showFrameEvent) delete m_showFrameEvent; - if (m_pauseEvent) delete m_pauseEvent; - if (m_mltConsumer) delete m_mltConsumer; - if (m_mltProducer) delete m_mltProducer; + delete m_showFrameEvent; + delete m_pauseEvent; + delete m_mltConsumer; + delete m_mltProducer; /*if (m_mltProducer) { Mlt::Service service(m_mltProducer->parent().get_service()); service.lock(); @@ -191,13 +192,14 @@ void Render::closeMlt() }*/ //kDebug() << "// // // CLOSE RENDERER " << m_name; - if (m_blackClip) delete m_blackClip; + delete m_blackClip; //delete m_osdInfo; } void Render::slotSwitchFullscreen() { - if (m_mltConsumer) m_mltConsumer->set("full_screen", 1); + if (m_mltConsumer) + m_mltConsumer->set("full_screen", 1); } void Render::buildConsumer(const QString &profileName) @@ -216,8 +218,7 @@ void Render::buildConsumer(const QString &profileName) m_mltProfile->set_sample_aspect(tmpProfile.sample_aspect_num(), tmpProfile.sample_aspect_den()); m_mltProfile->get_profile()->display_aspect_num = tmpProfile.display_aspect_num(); m_mltProfile->get_profile()->display_aspect_den = tmpProfile.display_aspect_den(); - } - else { + } else { m_mltProfile = new Mlt::Profile(m_activeProfile.toUtf8().constData()); } setenv("MLT_PROFILE", m_activeProfile.toUtf8().constData(), 1); @@ -332,8 +333,9 @@ Mlt::Producer *Render::invalidProducer(const QString &id) char *tmp = qstrdup(txt.toUtf8().constData()); clip = new Mlt::Producer(*m_mltProfile, tmp); delete[] tmp; - if (clip == NULL) clip = new Mlt::Producer(*m_mltProfile, "colour", "red"); - else { + if (clip == NULL) { + clip = new Mlt::Producer(*m_mltProfile, "colour", "red"); + } else { clip->set("bgcolour", "0xff0000ff"); clip->set("pad", "10"); } @@ -364,12 +366,15 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) } } - if (m_isSplitView) slotSplitView(false); - if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); + if (m_isSplitView) + slotSplitView(false); + if (!m_mltConsumer->is_stopped()) + m_mltConsumer->stop(); m_mltConsumer->purge(); } QString scene; - if (!dropSceneList) scene = sceneList(); + if (!dropSceneList) + scene = sceneList(); int pos = 0; double current_fps = m_mltProfile->fps(); double current_dar = m_mltProfile->dar(); @@ -475,7 +480,7 @@ int Render::renderHeight() const return m_mltProfile->height(); } -QImage Render::extractFrame(int frame_position, QString path, int width, int height) +QImage Render::extractFrame(int frame_position, const QString &path, int width, int height) { if (width == -1) { width = frameRenderWidth(); @@ -3032,7 +3037,7 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params) return true; } -bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) +bool Render::mltEditEffect(int track, const GenTime &position, EffectsParameterList params) { int index = params.paramValue("kdenlive_ix").toInt(); QString tag = params.paramValue("tag"); @@ -3112,7 +3117,8 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par delete clip; service.unlock(); - if (doRefresh) refresh(); + if (doRefresh) + refresh(); return true; } if (params.hasParam("_sync_in_out")) { @@ -3121,22 +3127,23 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par filter->set_in_and_out(clip->get_in(), clip->get_out()); } - for (int j = 0; j < params.count(); j++) { + for (int j = 0; j < params.count(); ++j) { filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData()); } - for (int j = 0; j < filtersList.count(); j++) { + for (int j = 0; j < filtersList.count(); ++j) { clip->attach(*(filtersList.at(j))); } delete clip; service.unlock(); - if (doRefresh) refresh(); + if (doRefresh) + refresh(); return true; } -bool Render::mltEnableEffects(int track, GenTime position, QList effectIndexes, bool disable) +bool Render::mltEnableEffects(int track, const GenTime &position, const QList &effectIndexes, bool disable) { if (position < GenTime()) { return mltEnableTrackEffects(track, effectIndexes, disable); @@ -3178,7 +3185,7 @@ bool Render::mltEnableEffects(int track, GenTime position, QList effectInd return true; } -bool Render::mltEnableTrackEffects(int track, QList effectIndexes, bool disable) +bool Render::mltEnableTrackEffects(int track, const QList &effectIndexes, bool disable) { Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); @@ -3201,7 +3208,7 @@ bool Render::mltEnableTrackEffects(int track, QList effectIndexes, bool di return true; } -void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos) +void Render::mltUpdateEffectPosition(int track, const GenTime &position, int oldPos, int newPos) { Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); @@ -3235,7 +3242,7 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in if (doRefresh) refresh(); } -void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) +void Render::mltMoveEffect(int track, const GenTime &position, int oldPos, int newPos) { if (position < GenTime()) { mltMoveTrackEffect(track, oldPos, newPos); @@ -4083,7 +4090,7 @@ void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenT //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); } -QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) +QMap Render::mltGetTransitionParamsFromXml(const QDomElement &xml) { QDomNodeList attribs = xml.elementsByTagName("parameter"); QMap map; @@ -4559,7 +4566,7 @@ void Render::updatePreviewSettings() } -QString Render::updateSceneListFps(double current_fps, double new_fps, QString scene) +QString Render::updateSceneListFps(double current_fps, double new_fps, const QString &scene) { // Update all frame positions to the new fps value //WARNING: there are probably some effects or other that hold a frame value @@ -4726,7 +4733,7 @@ bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force) return true; } -void Render::slotMultiStreamProducerFound(const QString path, QList audio_list, QList video_list, stringMap data) +void Render::slotMultiStreamProducerFound(const QString &path, QList audio_list, QList video_list, stringMap data) { if (KdenliveSettings::automultistreams()) { for (int i = 1; i < video_list.count(); ++i) {