From e8d7fcdcf399fe74a40a14db5d989d774e6f1d09 Mon Sep 17 00:00:00 2001 From: Till Theato Date: Sun, 31 Jul 2011 21:03:42 +0000 Subject: [PATCH] Remove (old) LADSPA related code. Now the ladspa folder is not used/created anymore, since ladspa effects are treated the same as other effects. svn path=/trunk/kdenlive/; revision=5817 --- src/customtrackview.cpp | 44 ------------ src/customtrackview.h | 1 - src/initeffects.cpp | 145 ---------------------------------------- src/initeffects.h | 14 ---- src/kdenlivedoc.cpp | 13 ---- src/kdenlivedoc.h | 1 - src/projectsettings.cpp | 2 +- src/renderer.cpp | 1 - src/trackview.cpp | 20 ------ 9 files changed, 1 insertion(+), 240 deletions(-) diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 0f7d88a8..32e2de5e 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1702,13 +1702,6 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * } item->initEffect(effect); - // Old LADSPA filter, deprecated - /* - if (effect.attribute("tag") == "ladspa") { - QString ladpsaFile = m_document->getLadspaFile(); - initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); - effect.setAttribute("src", ladpsaFile); - }*/ new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); count++; } @@ -1781,13 +1774,6 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } else { item->initEffect(effect); } - // Old LADSPA filter, deprecated - /* if (effect.attribute("tag") == "ladspa") { - QString ladpsaFile = m_document->getLadspaFile(); - initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); - effect.setAttribute("src", ladpsaFile); - } - */ new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); } } @@ -1874,11 +1860,6 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE if (pos < GenTime()) { // editing a track effect EffectsParameterList effectParams = getEffectArgs(effect); - // Old LADSPA filter, deprecated - /*if (effect.attribute("tag") == "ladspa") { - // Update the ladspa affect file - initEffects::ladspaEffectFile(effect.attribute("src"), effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); - }*/ // check if we are trying to reset a keyframe effect /*if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) { clip->initEffect(effect); @@ -1914,11 +1895,6 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE } EffectsParameterList effectParams = getEffectArgs(effect); - // Old LADSPA filter, deprecated - /*if (effect.attribute("tag") == "ladspa") { - // Update the ladspa affect file - initEffects::ladspaEffectFile(effect.attribute("src"), effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); - }*/ // check if we are trying to reset a keyframe effect if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) { clip->initEffect(effect); @@ -5804,26 +5780,6 @@ void CustomTrackView::autoTransition() setDocumentModified(); } - -QStringList CustomTrackView::getLadspaParams(QDomElement effect) const -{ - QStringList result; - QLocale locale; - QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { - QDomElement e = params.item(i).toElement(); - if (!e.isNull() && e.attribute("type") == "constant") { - if (e.hasAttribute("factor")) { - double factor = e.attribute("factor").toDouble(); - double value = e.attribute("value").toDouble(); - value = value / factor; - result.append(locale.toString(value)); - } else result.append(e.attribute("value")); - } - } - return result; -} - void CustomTrackView::clipNameChanged(const QString id, const QString name) { QList list = scene()->items(); diff --git a/src/customtrackview.h b/src/customtrackview.h index f968adf0..70c89e73 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -122,7 +122,6 @@ public: void deleteTimelineTrack(int ix, TrackInfo trackinfo); void saveThumbnails(); void autoTransition(); - QStringList getLadspaParams(QDomElement effect) const; void initCursorPos(int pos); /** @brief Locks or unlocks a track. diff --git a/src/initeffects.cpp b/src/initeffects.cpp index e3fe464f..36d06081 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -185,17 +185,6 @@ Mlt::Repository *initEffects::parseEffectFiles() // Fill transitions list. fillTransitionsList(repository, &MainWindow::transitions, transitionsItemList); - //WARNING: deprecated, we now use MLT to detect LADSPA filters - /* - // Set the directories to look into for ladspa plugins. - KGlobal::dirs()->addResourceType("ladspa_plugin", 0, "lib/ladspa"); - KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/lib/ladspa"); - KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib/ladspa"); - KGlobal::dirs()->addResourceDir("ladspa_plugin", "/opt/lib/ladspa"); - KGlobal::dirs()->addResourceDir("ladspa_plugin", "/opt/local/lib/ladspa"); - KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/lib64/ladspa"); - KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib64/ladspa");*/ - // Remove blacklisted effects from the filters list. QStringList mltFiltersList = filtersList; QFile file2(KStandardDirs::locate("appdata", "blacklisted_effects.txt")); @@ -483,140 +472,6 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au } } -//static -const char* initEffects::ladspaEffectString(int ladspaId, QStringList params) -{ - if (ladspaId == 1433) //Pitch - return ladspaPitchEffectString(params); - else if (ladspaId == 1216) //Room Reverb - return ladspaRoomReverbEffectString(params); - else if (ladspaId == 1423) //Reverb - return ladspaReverbEffectString(params); - else if (ladspaId == 1901) //Reverb - return ladspaEqualizerEffectString(params); - else { - kDebug() << "++++++++++ ASKING FOR UNKNOWN LADSPA EFFECT: " << ladspaId << endl; - return ""; - } -} - -//static -void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringList params) -{ - const char *filterString; - switch (ladspaId) { - case 1433: //Pitch - filterString = ladspaPitchEffectString(params); - break; - case 1905: //Vinyl - filterString = ladspaVinylEffectString(params); - break; - case 1216 : //Room Reverb - filterString = ladspaRoomReverbEffectString(params); - break; - case 1423: //Reverb - filterString = ladspaReverbEffectString(params); - break; - case 1195: //Declipper - filterString = ladspaDeclipEffectString(params); - break; - case 1901: //Reverb - filterString = ladspaEqualizerEffectString(params); - break; - case 1913: // Limiter - filterString = ladspaLimiterEffectString(params); - break; - case 1193: // Pitch Shifter - filterString = ladspaPitchShifterEffectString(params); - break; - case 1417: // Rate Scaler - filterString = ladspaRateScalerEffectString(params); - break; - case 1217: // Phaser - filterString = ladspaPhaserEffectString(params); - break; - case 1197: // 15 Band Equalizer - filterString = ladspaEqualizer15EffectString(params); - break; - default: - kDebug() << "++++++++++ ASKING FOR UNKNOWN LADSPA EFFECT: " << ladspaId << endl; - return; - break; - } - - QFile f(fname); - if (f.open(QIODevice::WriteOnly)) { - QTextStream stream(&f); - stream << filterString; - f.close(); - } else kDebug() << "++++++++++ ERROR CANNOT WRITE TO: " << KdenliveSettings::currenttmpfolder() + fname << endl; - delete [] filterString; -} - -const QString jackString = "248000"; - - -const char* initEffects::ladspaDeclipEffectString(QStringList) -{ - return qstrdup(QString(jackString + "1195truefalsetrue1.0000001.000000true").toUtf8()); -} - -/* -const char* initEffects::ladspaVocoderEffectString(QStringList params) -{ - return qstrdup( QString(jackString + "1441truefalsetrue1.0000001.000000truetrue0.0000000.000000true%1%1true%1%1true%1%1true%1%1true%2%2true%2%2true%2%2true%2%2true%3%3true%3%3true%3%3true%3%3true%4%4true%4%4true%4%4true%4%4").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3])); -}*/ - -const char* initEffects::ladspaVinylEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1905truefalsetrue1.0000001.000000%1%2%3%4%5").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).arg(params[4]).toUtf8()); -} - -const char* initEffects::ladspaPitchEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1433truefalsetrue1.01.0truetrue%1%1true4.0000004.000000").arg(params[0]).toUtf8()); -} - -const char* initEffects::ladspaRoomReverbEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1216truefalsetrue1.0000001.000000truetrue%1%1true%2%2true%3%3true0.7500000.750000true-70.000000-70.000000true0.0000000.000000true-17.500000-17.500000").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8()); -} - -const char* initEffects::ladspaReverbEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1423true falsetrue 1.0000001.000000 truetrue%1 %1true%2%2true0.2500000.250000").arg(params[0]).arg(params[1]).toUtf8()); -} - -const char* initEffects::ladspaEqualizerEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1901true falsetrue 1.0000001.000000%1%2 %3").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8()); -} - -const char* initEffects::ladspaLimiterEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1913truefalsetrue1.0000001.000000%1%2%3").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8()); -} - -const char* initEffects::ladspaPitchShifterEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1193truefalsetrue1.0000001.000000truetrue%1%1").arg(params[0]).toUtf8()); -} - -const char* initEffects::ladspaRateScalerEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1417truefalsetrue1.0000001.000000truetrue%1%1").arg(params[0]).toUtf8()); -} - -const char* initEffects::ladspaPhaserEffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1217truefalsetrue1.0000001.000000truetrue%1%1true%2%2true%3%3true%4%4").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).toUtf8()); -} -const char* initEffects::ladspaEqualizer15EffectString(QStringList params) -{ - return qstrdup(QString(jackString + "1197truefalsetrue1.0000001.000000truetrue%1%1true%2%2true%3%3true%4%4true%5%5true%6%6true%7%7true%8%8true%9%9true%10%10true%11%11true%12%12true%13%13true%14%14true%15%15").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).arg(params[4]).arg(params[5]).arg(params[6]).arg(params[7]).arg(params[8]).arg(params[9]).arg(params[10]).arg(params[11]).arg(params[12]).arg(params[13]).arg(params[14]).toUtf8()); -} - - QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& /*type*/, const QString& filtername) { diff --git a/src/initeffects.h b/src/initeffects.h index 434d79b7..f0a431ae 100644 --- a/src/initeffects.h +++ b/src/initeffects.h @@ -106,20 +106,6 @@ public: /** @brief Reloads information about custom effects. */ static void parseCustomEffectsFile(); - static const char* ladspaEffectString(int ladspaId, QStringList params); - static void ladspaEffectFile(const QString & fname, int ladspaId, QStringList params); - - static const char* ladspaPitchEffectString(QStringList params); - static const char* ladspaReverbEffectString(QStringList params); - static const char* ladspaRoomReverbEffectString(QStringList params); - static const char* ladspaEqualizerEffectString(QStringList params); - static const char* ladspaDeclipEffectString(QStringList); - static const char* ladspaVinylEffectString(QStringList params); - static const char* ladspaLimiterEffectString(QStringList params); - static const char* ladspaPitchShifterEffectString(QStringList params); - static const char* ladspaPhaserEffectString(QStringList params); - static const char* ladspaRateScalerEffectString(QStringList params); - static const char* ladspaEqualizer15EffectString(QStringList params); private: initEffects(); // disable the constructor diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 8fb4b376..f453f70d 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -299,7 +299,6 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup // Make sure that the necessary folders exist KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "titles/"); KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/"); - KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/"); KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "proxy/"); updateProjectFolderPlacesEntry(); @@ -761,7 +760,6 @@ void KdenliveDoc::setProjectFolder(KUrl url) void KdenliveDoc::moveProjectData(KUrl url) { QList list = m_clipManager->documentClipList(); - //TODO: Also move ladspa effects files for (int i = 0; i < list.count(); i++) { DocClipBase *clip = list.at(i); if (clip->clipType() == TEXT) { @@ -1357,17 +1355,6 @@ void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const pix.save(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + fileId + ".png"); } -QString KdenliveDoc::getLadspaFile() const -{ - int ct = 0; - QString counter = QString::number(ct).rightJustified(5, '0', false); - while (QFile::exists(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa")) { - ct++; - counter = QString::number(ct).rightJustified(5, '0', false); - } - return m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa"; -} - bool KdenliveDoc::checkDocumentClips(QDomNodeList infoproducers) { DocumentChecker d(infoproducers, m_document); diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h index 0d1cd569..17bbf972 100644 --- a/src/kdenlivedoc.h +++ b/src/kdenlivedoc.h @@ -143,7 +143,6 @@ Q_OBJECT public: void cachePixmap(const QString &fileId, const QPixmap &pix) const; void setProjectFolder(KUrl url); - QString getLadspaFile() const; void setZone(int start, int end); QPoint zone() const; int setSceneList(); diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index 8edb9254..39e0a4c7 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -218,7 +218,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) // List all files that are used in the project. That also means: // images included in slideshow and titles, files in playlist clips - // TODO: images used in luma transitions, files used for LADSPA effects? + // TODO: images used in luma transitions? // Setup categories QTreeWidgetItem *videos = new QTreeWidgetItem(files_list, QStringList() << i18n("Video clips")); diff --git a/src/renderer.cpp b/src/renderer.cpp index 15d8e52c..19c836e9 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -2348,7 +2348,6 @@ bool Render::mltRemoveEffect(int track, GenTime position, int index, bool update } delete clip; -// if (tag.startsWith("ladspa")) tag = "ladspa"; m_isBlocked = true; mlt_service_lock(service.get_service()); int ct = 0; diff --git a/src/trackview.cpp b/src/trackview.cpp index 0e2bcd8a..62dd37b5 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -759,7 +759,6 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo QString effecttag; QString effectid; QString effectindex = QString::number(effectNb); - QString ladspaEffectFile; // Get effect tag & index for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { // parse effect parameters @@ -774,15 +773,6 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } else if (effectparam.attribute("name") == "kdenlive_ix") { // Fix effects index effectparam.firstChild().setNodeValue(effectindex); - } else if (effectparam.attribute("name") == "src") { - ladspaEffectFile = effectparam.text(); - if (!QFile::exists(ladspaEffectFile)) { - // If the ladspa effect file is missing, recreate it - kDebug() << "// MISSING LADSPA FILE: " << ladspaEffectFile; - ladspaEffectFile = m_doc->getLadspaFile(); - effectparam.firstChild().setNodeValue(ladspaEffectFile); - kDebug() << "// ... REPLACED WITH: " << ladspaEffectFile; - } } } //kDebug() << "+ + CLIP EFF FND: " << effecttag << ", " << effectid << ", " << effectindex; @@ -931,16 +921,6 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } } } - // Old LADSPA filter, deprecated - /*if (effecttag == "ladspa") { - //QString ladspaEffectFile = EffectsList::parameter(effect, "src", "property"); - - if (!QFile::exists(ladspaEffectFile)) { - // If the ladspa effect file is missing, recreate it - initEffects::ladspaEffectFile(ladspaEffectFile, currenteffect.attribute("ladspaid").toInt(), m_trackview->getLadspaParams(currenteffect)); - } - currenteffect.setAttribute("src", ladspaEffectFile); - }*/ if (disableeffect) currenteffect.setAttribute("disable", "1"); if (clip) -- 2.39.2