All MESS plugins: compile with -fvisibility=hidden, fixes LADSPA plugins not appearing in list.

Added simpledrums2 (from muse_qt4_evolution).

3 files changed, 15 insertions, 3 deletions

diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index e07b6c6e..f9087051 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -1395,7 +1395,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
             }
 
       initMidiSynth();
-
+      
       populateAddTrack(addTrack);
       
       transport = new Transport(this, "transport");
@@ -3460,6 +3460,7 @@ int main(int argc, char* argv[])
       initMetronome();
       //QApplication::clipboard()->setSelectionMode(false); ddskrjo
 
+      
       QApplication::addLibraryPath(museGlobalLib + "/qtplugins");
       if (debugMsg) {
             QStringList list = app.libraryPaths();
@@ -3474,6 +3475,7 @@ int main(int argc, char* argv[])
       muse = new MusE(argc, &argv[optind]);
       app.setMuse(muse);
       muse->setIcon(*museIcon);
+      
       // Added by Tim. p3.3.22
       if (!debugMode) {
             if (mlockall(MCL_CURRENT | MCL_FUTURE))
diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp
index 9bcf11bf..61e49401 100644
--- a/muse2/muse/plugin.cpp
+++ b/muse2/muse/plugin.cpp
@@ -972,6 +972,9 @@ static void loadPluginLib(QFileInfo* fi)
         //LADSPA_Properties properties = descr->LADSPA_Plugin->Properties;
         //bool inPlaceBroken = LADSPA_IS_INPLACE_BROKEN(properties);
         //plugins.add(fi, descr, !inPlaceBroken);
+        if(debugMsg)
+          fprintf(stderr, "loadPluginLib: adding dssi effect plugin:%s name:%s label:%s\n", fi->filePath().latin1(), descr->LADSPA_Plugin->Name, descr->LADSPA_Plugin->Label);
+      
         plugins.add(fi, descr->LADSPA_Plugin, true);
       }
     }      
@@ -1014,6 +1017,8 @@ static void loadPluginLib(QFileInfo* fi)
       //LADSPA_Properties properties = descr->Properties;
       //bool inPlaceBroken = LADSPA_IS_INPLACE_BROKEN(properties);
       //plugins.add(fi, ladspa, descr, !inPlaceBroken);
+      if(debugMsg)
+        fprintf(stderr, "loadPluginLib: adding ladspa plugin:%s name:%s label:%s\n", fi->filePath().latin1(), descr->Name, descr->Label);
       plugins.add(fi, descr);
     }
   }  
@@ -1082,7 +1087,7 @@ void initPlugins()
       p = ladspaPath;
       
       if(debugMsg)
-        fprintf(stderr, "loadPluginLib: ladspa path:%s\n", ladspaPath);
+        fprintf(stderr, "loadPluginDir: ladspa path:%s\n", ladspaPath);
       
       while (*p != '\0') {
             const char* pe = p;
@@ -1095,7 +1100,7 @@ void initPlugins()
                   strncpy(buffer, p, n);
                   buffer[n] = '\0';
                   if(debugMsg)
-                    fprintf(stderr, "loadPluginLib: loading ladspa dir:%s\n", buffer);
+                    fprintf(stderr, "loadPluginDir: loading ladspa dir:%s\n", buffer);
                   
                   loadPluginDir(QString(buffer));
                   delete[] buffer;
diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp
index 4d377fb4..74a27290 100644
--- a/muse2/muse/synth.cpp
+++ b/muse2/muse/synth.cpp
@@ -36,6 +36,9 @@
 #include "midictrl.h"
 //#include "stringparam.h"
 
+// REMOVE Tim.
+#include "plugin.h"
+
 std::vector<Synth*> synthis;  // array of available synthis
 
 extern void connectNodes(AudioTrack*, AudioTrack*);
@@ -509,6 +512,8 @@ void initMidiSynth()
                   const char* path = fi->filePath().latin1();
             
                   // load Synti dll
+                  //printf("initMidiSynth: dlopen file:%s name:%s desc:%s\n", fi->filePath().latin1(), QString(descr->name), QString(descr->description), QString(""), QString(descr->version)));
+                  printf("initMidiSynth: dlopen file:%s\n", fi->filePath().latin1());
                   void* handle = dlopen(path, RTLD_NOW);
                   if (handle == 0) {
                         fprintf(stderr, "initMidiSynth: MESS dlopen(%s) failed: %s\n", path, dlerror());