some ladspa plugin changes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1426 90c681e8-e032-0410-971d-27865f9a5e38

8 files changed, 19 insertions, 17 deletions

diff --git a/src/plugins/Effect/ladspa/effectladspafactory.cpp b/src/plugins/Effect/ladspa/effectladspafactory.cpp
index 6c517408f..792e113b6 100644
--- a/src/plugins/Effect/ladspa/effectladspafactory.cpp
+++ b/src/plugins/Effect/ladspa/effectladspafactory.cpp
@@ -22,7 +22,7 @@
 #include <qmmp/qmmp.h>
 #include "effectladspafactory.h"
 #include "settingsdialog.h"
-#include "ladspaplugin.h"
+#include "ladspahost.h"
 
 const EffectProperties EffectLADSPAFactory::properties() const
 {
diff --git a/src/plugins/Effect/ladspa/ladspa.pro b/src/plugins/Effect/ladspa/ladspa.pro
index 2e50e43c2..ee2be3f34 100644
--- a/src/plugins/Effect/ladspa/ladspa.pro
+++ b/src/plugins/Effect/ladspa/ladspa.pro
@@ -1,9 +1,10 @@
 include(../../plugins.pri)
-HEADERS += ladspaplugin.h \
+HEADERS += ladspahost.h \
     effectladspafactory.h \
     settingsdialog.h \
-    ladspaslider.h
-SOURCES += ladspaplugin.cpp \
+    ladspaslider.h \
+    ladspa.h
+SOURCES += ladspahost.cpp \
     effectladspafactory.cpp \
     settingsdialog.cpp \
     ladspaslider.cpp
diff --git a/src/plugins/Effect/ladspa/ladspaplugin.cpp b/src/plugins/Effect/ladspa/ladspahost.cpp
index bef363397..a204f2c2b 100644
--- a/src/plugins/Effect/ladspa/ladspaplugin.cpp
+++ b/src/plugins/Effect/ladspa/ladspahost.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <qmmp/qmmp.h>
-#include "ladspaplugin.h"
+#include "ladspahost.h"
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096
@@ -151,6 +151,7 @@ void LADSPAHost::unload(LADSPAEffect *instance)
         instance->library = 0;
     }
     m_effects.removeAll(instance);
+    qDeleteAll(instance->controls);
     delete instance;
 }
 
diff --git a/src/plugins/Effect/ladspa/ladspaplugin.h b/src/plugins/Effect/ladspa/ladspahost.h
index fa9b0200e..c73d81ab3 100644
--- a/src/plugins/Effect/ladspa/ladspaplugin.h
+++ b/src/plugins/Effect/ladspa/ladspahost.h
@@ -17,24 +17,22 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#ifndef LADSPAPLUGIN_H
-#define LADSPAPLUGIN_H
+#ifndef LADSPAHOST_H
+#define LADSPAHOST_H
 
 #include <QMutex>
 #include <QList>
 #include <qmmp/effect.h>
-#include <ladspa.h>
+#include "ladspa.h"
 
 class QWidget;
 
-/**
-    @author Ilya Kotov <forkotov02@hotmail.ru>
-*/
-
 #define MAX_SAMPLES 8192
 #define MAX_KNOBS 64
 
-
+/**
+    @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
 class LADSPAPlugin
 {
 public:
diff --git a/src/plugins/Effect/ladspa/ladspaslider.cpp b/src/plugins/Effect/ladspa/ladspaslider.cpp
index 067a3d5ab..87e3c01f2 100644
--- a/src/plugins/Effect/ladspa/ladspaslider.cpp
+++ b/src/plugins/Effect/ladspa/ladspaslider.cpp
@@ -22,7 +22,7 @@
 #include <QDoubleSpinBox>
 #include <QSlider>
 #include <QHBoxLayout>
-#include "ladspaplugin.h"
+#include "ladspahost.h"
 #include "ladspaslider.h"
 
 LADSPASlider::LADSPASlider(double min, double max, double step, LADSPA_Data *value,
diff --git a/src/plugins/Effect/ladspa/ladspaslider.h b/src/plugins/Effect/ladspa/ladspaslider.h
index c0863b902..a7290581a 100644
--- a/src/plugins/Effect/ladspa/ladspaslider.h
+++ b/src/plugins/Effect/ladspa/ladspaslider.h
@@ -21,7 +21,7 @@
 #define LADSPASLIDER_H
 
 #include <QWidget>
-#include <ladspa.h>
+#include "ladspa.h"
 
 class QDoubleSpinBox;
 class QSlider;
diff --git a/src/plugins/Effect/ladspa/settingsdialog.cpp b/src/plugins/Effect/ladspa/settingsdialog.cpp
index e4d78a698..b91fbb2d7 100644
--- a/src/plugins/Effect/ladspa/settingsdialog.cpp
+++ b/src/plugins/Effect/ladspa/settingsdialog.cpp
@@ -27,7 +27,7 @@
 #include <QLabel>
 #include <qmmp/qmmp.h>
 #include "ladspaslider.h"
-#include "ladspaplugin.h"
+#include "ladspahost.h"
 #include "settingsdialog.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent)
@@ -59,6 +59,8 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         m_model->setData(m_model->index(i, 0), (uint) plugin_list[i]->unique_id);
         m_model->setData(m_model->index(i, 1), plugin_list[i]->name);
     }
+    ui.pluginsTreeView->resizeColumnToContents (0);
+    ui.pluginsTreeView->resizeColumnToContents (1);
     updateRunningPlugins();
 }
 
diff --git a/src/plugins/Effect/ladspa/settingsdialog.ui b/src/plugins/Effect/ladspa/settingsdialog.ui
index c47d52a5f..8c1653224 100644
--- a/src/plugins/Effect/ladspa/settingsdialog.ui
+++ b/src/plugins/Effect/ladspa/settingsdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>BS2B Plugin Settings</string>
+   <string>LADSPA Host Catalog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">