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

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 0f7d88a8993830d14db0482b9d1db983e0804c53..32e2de5e9223fc93e2ca9d9616e4079186195607 100644 (file)
--- 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<QGraphicsItem *> list = scene()->items();

diff --git a/src/customtrackview.h b/src/customtrackview.h
index f968adf0bd53497b451683ad449c4925eed0b479..70c89e738a81c28d656aab5f1a79784d6d6a8954 100644 (file)
--- 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 e3fe464f72f46e36f5cfe2f6fe53235a0f6d4de9..36d060815467db3546a9922f5e4cc1ff71924930 100644 (file)
--- 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 "<jackrack></jackrack>";
-    }
-}
-
-//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 = "<?xml version=\"1.0\"?><!DOCTYPE jackrack SYSTEM \"http://purge.bash.sh/~rah/jack_rack_1.2.dtd\"><jackrack><channels>2</channels><samplerate>48000</samplerate><plugin><id>";
-
-
-const char* initEffects::ladspaDeclipEffectString(QStringList)
-{
-    return qstrdup(QString(jackString + "1195</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall></plugin></jackrack>").toUtf8());
-}
-
-/*
-const char* initEffects::ladspaVocoderEffectString(QStringList params)
-{
- return qstrdup( QString(jackString + "1441</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>0.000000</value><value>0.000000</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]));
-}*/
-
-const char* initEffects::ladspaVinylEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1905</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><controlrow><value>%1</value></controlrow><controlrow><value>%2</value></controlrow><controlrow><value>%3</value></controlrow><controlrow><value>%4</value></controlrow><controlrow><value>%5</value></controlrow></plugin></jackrack>").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 + "1433</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.0</value><value>1.0</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>4.000000</value><value>4.000000</value></controlrow></plugin></jackrack>").arg(params[0]).toUtf8());
-}
-
-const char* initEffects::ladspaRoomReverbEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1216</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>0.750000</value><value>0.750000</value></controlrow><controlrow><lock>true</lock><value>-70.000000</value><value>-70.000000</value></controlrow><controlrow><lock>true</lock><value>0.000000</value><value>0.000000</value></controlrow><controlrow><lock>true</lock><value>-17.500000</value><value>-17.500000</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
-}
-
-const char* initEffects::ladspaReverbEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1423</id><enabled>true</enabled>  <wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked>    <wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values>    <lockall>true</lockall><controlrow><lock>true</lock><value>%1</value>      <value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>0.250000</value><value>0.250000</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).toUtf8());
-}
-
-const char* initEffects::ladspaEqualizerEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1901</id><enabled>true</enabled>    <wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked>    <wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><controlrow><value>%1</value></controlrow><controlrow><value>%2</value></controlrow>    <controlrow><value>%3</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
-}
-
-const char* initEffects::ladspaLimiterEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1913</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><controlrow><value>%1</value></controlrow><controlrow><value>%2</value></controlrow><controlrow><value>%3</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
-}
-
-const char* initEffects::ladspaPitchShifterEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1193</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow></plugin></jackrack>").arg(params[0]).toUtf8());
-}
-
-const char* initEffects::ladspaRateScalerEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1417</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow></plugin></jackrack>").arg(params[0]).toUtf8());
-}
-
-const char* initEffects::ladspaPhaserEffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1217</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).toUtf8());
-}
-const char* initEffects::ladspaEqualizer15EffectString(QStringList params)
-{
-    return qstrdup(QString(jackString + "1197</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow><controlrow><lock>true</lock><value>%5</value><value>%5</value></controlrow><controlrow><lock>true</lock><value>%6</value><value>%6</value></controlrow><controlrow><lock>true</lock><value>%7</value><value>%7</value></controlrow><controlrow><lock>true</lock><value>%8</value><value>%8</value></controlrow><controlrow><lock>true</lock><value>%9</value><value>%9</value></controlrow><controlrow><lock>true</lock><value>%10</value><value>%10</value></controlrow><controlrow><lock>true</lock><value>%11</value><value>%11</value></controlrow><controlrow><lock>true</lock><value>%12</value><value>%12</value></controlrow><controlrow><lock>true</lock><value>%13</value><value>%13</value></controlrow><controlrow><lock>true</lock><value>%14</value><value>%14</value></controlrow><controlrow><lock>true</lock><value>%15</value><value>%15</value></controlrow></plugin></jackrack>").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 434d79b7259aa65972013aa0fd95bce040cd79b6..f0a431ae5c52437b3446c2f1ace2b9e971cbd518 100644 (file)
--- 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 8fb4b3761c5b9a4c9a0d22654504063216fb04f3..f453f70dc1ccaf4db089d323f8442fa6e4b195f2 100644 (file)
--- 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 <DocClipBase*> 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 0d1cd56934b7f7801b8e9a354534ebbff763f9e2..17bbf9723991ed705de3ccd546fee82789e08427 100644 (file)
--- 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 8edb92549b09a9baecc8663b7841cf0be5062b4f..39e0a4c7b963c27388c44e0375efd1c0b74edbc8 100644 (file)
--- 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 15d8e52c8045661b9babafcd530ed45ba18de8db..19c836e960f8319548605f91f94d9dd5613f8cf5 100644 (file)
--- 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 0e2bcd8a1b2bbacf67fcf032f8e68eccf1914fa3..62dd37b5689e9994b64a1d0f5630505793dd91eb 100644 (file)
--- 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)