merged with trunk

1 files changed, 35 insertions, 29 deletions

diff --git a/muse2/muse/dssihost.h b/muse2/muse/dssihost.h
index 2836d72e..1166886a 100644
--- a/muse2/muse/dssihost.h
+++ b/muse2/muse/dssihost.h
@@ -26,15 +26,21 @@
 
 #include "config.h"
 
-#include <vector>
-#include <map>
-#include <string>
-
 // Make sure this number is unique among all the MESS synths and DSSI host synth.
 #define DSSI_SYNTH_UNIQUE_ID 8
 // Midistate sysex initialization command.
 #define DSSI_INIT_DATA_CMD 1
 
+#define DSSI_PARAMSAVE_VERSION_MAJOR  0
+#define DSSI_PARAMSAVE_VERSION_MINOR  1
+
+
+#ifdef DSSI_SUPPORT
+
+#include <vector>
+#include <map>
+#include <string>
+
 #ifdef OSC_SUPPORT
 #include <lo/lo.h>
 #include "osc.h"
@@ -42,6 +48,7 @@
 
 #include "ladspa.h"
 #include <dssi.h>
+
 #include <alsa/asoundlib.h>
 
 #include "midictrl.h"
@@ -53,15 +60,15 @@
 //#include <QMenu>
 #include "popupmenu.h"
 
-#define DSSI_PARAMSAVE_VERSION_MAJOR  0
-#define DSSI_PARAMSAVE_VERSION_MINOR  1
+#endif // DSSI_SUPPORT
 
 namespace MusECore {
  
+#ifdef DSSI_SUPPORT
+
 struct _DSSI;
 class DssiPluginIF;
 
-//class LadspaPort;
 class Port;
 
 //---------------------------------------------------------
@@ -76,7 +83,6 @@ class DssiSynth : public Synth {
       unsigned long _portCount, _inports, _outports, _controlInPorts, _controlOutPorts;
       std::vector<unsigned long> iIdx;  // Audio input index to port number.
       std::vector<unsigned long> oIdx;  // Audio output index to port number.
-      //std::vector<bool> iUsedIdx;       // During process, tells whether an audio input port was used by any input routes.
       std::vector<int> iUsedIdx;       // During process, tells whether an audio input port was used by any input routes.
       std::vector<unsigned long> rpIdx; // Port number to control input index. Item is -1 if it's not a control input.
       MusECore::MidiCtl2LadspaPortMap midiCtl2PortMap;   // Maps midi controller numbers to DSSI port numbers.
@@ -95,7 +101,6 @@ class DssiSynth : public Synth {
       virtual SynthIF* createSIF(SynthI*);
       
       friend class DssiSynthIF;
-      //float defaultValue(int); // Not required
       unsigned long inPorts()     const { return _inports; }
       unsigned long outPorts()    const { return _outports; }
       unsigned long inControls()  const { return _controlInPorts; }
@@ -179,19 +184,18 @@ class DssiSynthIF : public SynthIF, public PluginIBase
 
       #ifdef OSC_SUPPORT
       OscDssiIF& oscIF() { return _oscif; }
-      int oscProgram(unsigned long /*prog*/, unsigned long /*bank*/);
-      int oscControl(unsigned long /*dssiPort*/, float /*val*/);
-      int oscMidi(int /*a*/, int /*b*/, int /*c*/);
-      int oscConfigure(const char */*key*/, const char */*val*/);
+      int oscProgram(unsigned long prog, unsigned long bank);
+      int oscControl(unsigned long dssiPort, float val);
+      int oscMidi(int a, int b, int c);
+      int oscConfigure(const char *key, const char *val);
       int oscUpdate();
-      //int oscExiting();
       #endif
 
       //-------------------------
       // Methods for PluginIBase:
       //-------------------------
       bool on() const;       
-      void setOn(bool /*val*/);   
+      void setOn(bool val);   
       unsigned long pluginID();        
       int id();
       QString pluginLabel() const;  
@@ -201,28 +205,30 @@ class DssiSynthIF : public SynthIF, public PluginIBase
       QString fileName() const;
       QString titlePrefix() const;
       MusECore::AudioTrack* track();          
-      void enableController(unsigned long /*i*/, bool v = true);      
-      bool controllerEnabled(unsigned long /*i*/) const;          
-      bool controllerEnabled2(unsigned long /*i*/) const;          
+      void enableController(unsigned long i, bool v = true);      
+      bool controllerEnabled(unsigned long i) const;          
+      bool controllerEnabled2(unsigned long i) const;          
       void updateControllers();
-      void writeConfiguration(int /*level*/, Xml& /*xml*/);
-      bool readConfiguration(Xml& /*xml*/, bool readPreset=false);
+      void writeConfiguration(int level, Xml& xml);
+      bool readConfiguration(Xml& xml, bool readPreset=false);
 
       unsigned long parameters() const;                            
       unsigned long parametersOut() const;
-      void setParam(unsigned long /*i*/, float /*val*/); 
-      float param(unsigned long /*i*/) const;        
-      float paramOut(unsigned long /*i*/) const;        
-      const char* paramName(unsigned long /*i*/);     
-      const char* paramOutName(unsigned long /*i*/);
-      LADSPA_PortRangeHint range(unsigned long /*i*/);
-      LADSPA_PortRangeHint rangeOut(unsigned long /*i*/);
-      CtrlValueType ctrlValueType(unsigned long /*i*/) const; 
-      CtrlList::Mode ctrlMode(unsigned long /*i*/) const; 
+      void setParam(unsigned long i, float val); 
+      float param(unsigned long i) const;        
+      float paramOut(unsigned long i) const;        
+      const char* paramName(unsigned long i);     
+      const char* paramOutName(unsigned long i);
+      LADSPA_PortRangeHint range(unsigned long i);
+      LADSPA_PortRangeHint rangeOut(unsigned long i);
+      CtrlValueType ctrlValueType(unsigned long i) const; 
+      CtrlList::Mode ctrlMode(unsigned long i) const; 
 
       friend class DssiSynth;
       };
 
+#endif // DSSI_SUPPORT
+      
 extern void initDSSI();
 
 } // namespace MusECore