merged with trunk

1 files changed, 14 insertions, 13 deletions

diff --git a/muse2/muse/osc.h b/muse2/muse/osc.h
index e3f1a26d..f75b5168 100644
--- a/muse2/muse/osc.h
+++ b/muse2/muse/osc.h
@@ -24,14 +24,19 @@
 #ifndef __OSC_H__
 #define __OSC_H__
 
-#include <lo/lo.h>
-
 #include "config.h"
 
+#ifdef OSC_SUPPORT
+#include <lo/lo.h>
+
 class QProcess;
 class QString;
 
+#endif // OSC_SUPPORT
+
 namespace MusECore { 
+#ifdef OSC_SUPPORT
+  
 #ifdef DSSI_SUPPORT
 class DssiSynthIF;
 #endif
@@ -53,8 +58,8 @@ class OscIF
       char* _uiOscShowPath;
       bool _oscGuiVisible;
    
-      virtual bool oscInitGui(const QString& /*typ*/, const QString& /*baseName*/, const QString& /*name*/, 
-                       const QString& /*label*/, const QString& /*filePath*/, const QString& /*guiPath*/);
+      virtual bool oscInitGui(const QString& typ, const QString& baseName, const QString& name, 
+                       const QString& label, const QString& filePath, const QString& guiPath);
                        
    public:
       OscIF();
@@ -67,9 +72,9 @@ class OscIF
       virtual int oscMidi(lo_arg**)      { return 0; }      
       virtual int oscConfigure(lo_arg**) { return 0; } 
    
-      virtual void oscSendProgram(unsigned long /*prog*/, unsigned long /*bank*/);    
-      virtual void oscSendControl(unsigned long /*dssiPort*/, float /*val*/);    
-      virtual void oscSendConfigure(const char */*key*/, const char */*val*/); 
+      virtual void oscSendProgram(unsigned long prog, unsigned long bank);    
+      virtual void oscSendControl(unsigned long dssiPort, float val);    
+      virtual void oscSendConfigure(const char *key, const char *val); 
       
       virtual bool oscInitGui() { return false; }
       virtual void oscShowGui(bool);
@@ -85,15 +90,11 @@ class OscEffectIF : public OscIF
    
    public:
       OscEffectIF() {}
-      //~OscEffectIF();
 
       void oscSetPluginI(PluginI*);
       
       virtual int oscUpdate(lo_arg**);
-      //virtual int oscProgram(lo_arg**);
       virtual int oscControl(lo_arg**);
-      //virtual int oscExiting(lo_arg**);
-      //virtual int oscMidi(lo_arg**);
       virtual int oscConfigure(lo_arg**);
       
       virtual bool oscInitGui();
@@ -109,14 +110,12 @@ class OscDssiIF : public OscIF
       
    public:
       OscDssiIF() {}
-      //~OscDssiIF();
       
       void oscSetSynthIF(DssiSynthIF*);
       
       virtual int oscUpdate(lo_arg**);
       virtual int oscProgram(lo_arg**);
       virtual int oscControl(lo_arg**);
-      //virtual int oscExiting(lo_arg**);
       virtual int oscMidi(lo_arg**);
       virtual int oscConfigure(lo_arg**);
       
@@ -125,6 +124,8 @@ class OscDssiIF : public OscIF
       virtual QString titlePrefix() const; 
 };
 #endif // DSSI_SUPPORT
+
+#endif // OSC_SUPPORT
  
 extern void initOSC();