merged namespace changes. HOPEFULLY the last one.

4 files changed, 18 insertions, 18 deletions

diff --git a/muse2/synti/fluid/fluid.cpp b/muse2/synti/fluid/fluid.cpp
index 1431460f..48d68fb4 100644
--- a/muse2/synti/fluid/fluid.cpp
+++ b/muse2/synti/fluid/fluid.cpp
@@ -137,7 +137,7 @@ bool ISynth::setController(int ch, int ctrl, int val)
             return true;
             }
       switch(ctrl) {
-            case CTRL_PROGRAM:
+            case MusECore::CTRL_PROGRAM:
                   {
                   int hbank = (val & 0xff0000) >> 16;
                   int lbank = (val & 0xff00) >> 8;
@@ -153,7 +153,7 @@ bool ISynth::setController(int ch, int ctrl, int val)
                   }
                   break;
 
-            case CTRL_PITCH:
+            case MusECore::CTRL_PITCH:
                   fluid_synth_pitch_bend (_fluidsynth, ch, val);
                   break;
 
@@ -374,23 +374,23 @@ void ISynth::process(float** ports, int offset, int n)
 //   processEvent
 //    All events from the sequencer go here
 //---------------------------------------------------------
-bool ISynth::processEvent(const MidiPlayEvent& ev)
+bool ISynth::processEvent(const MusECore::MidiPlayEvent& ev)
       {
       switch(ev.type()) {
-            case ME_CONTROLLER:
+            case MusECore::ME_CONTROLLER:
                   setController(ev.channel(), ev.dataA(), ev.dataB());
                   return true;
-            case ME_NOTEON:
+            case MusECore::ME_NOTEON:
                   return playNote(ev.channel(), ev.dataA(), ev.dataB());
-            case ME_NOTEOFF:
+            case MusECore::ME_NOTEOFF:
                   return playNote(ev.channel(), ev.dataA(), 0);
-            case ME_SYSEX:
+            case MusECore::ME_SYSEX:
                   return sysex(ev.len(), ev.data());
-            case ME_PITCHBEND:
-                setController(ev.channel(), CTRL_PITCH, ev.dataA());
+            case MusECore::ME_PITCHBEND:
+                setController(ev.channel(), MusECore::CTRL_PITCH, ev.dataA());
                 break;            
-            case ME_PROGRAM:
-                setController(ev.channel(), CTRL_PROGRAM, ev.dataA());
+            case MusECore::ME_PROGRAM:
+                setController(ev.channel(), MusECore::CTRL_PROGRAM, ev.dataA());
                 break;   
             default:
                 break;
@@ -405,7 +405,7 @@ bool ISynth::processEvent(const MidiPlayEvent& ev)
 const char* ISynth::getPatchName(int /*ch*/, int val, int, bool /*drum*/) const
       {
       int prog =   val & 0xff;
-      if(val == CTRL_VAL_UNKNOWN || prog == 0xff)
+      if(val == MusECore::CTRL_VAL_UNKNOWN || prog == 0xff)
             return "<unknown>";
       prog &= 0x7f;
       
@@ -593,7 +593,7 @@ void ISynth::noRTHelper()
                   if(slen != 0)
                     memcpy(d + 1, fontname, slen);
                   d[1 + slen] = 0;
-                  MidiPlayEvent ev(0,0, ME_SYSEX, d, n);
+                  MusECore::MidiPlayEvent ev(0,0, MusECore::ME_SYSEX, d, n);
                   gui->writeEvent(ev);
                   
                   #ifdef FS_DEBUG
diff --git a/muse2/synti/fluid/fluid.h b/muse2/synti/fluid/fluid.h
index cc5dfc26..658be687 100644
--- a/muse2/synti/fluid/fluid.h
+++ b/muse2/synti/fluid/fluid.h
@@ -75,7 +75,7 @@ class ISynth : public Mess {
 	virtual bool setController(int, int, int);
       virtual bool sysex(int len, const unsigned char* p);
     
-      virtual bool processEvent(const MidiPlayEvent&);
+      virtual bool processEvent(const MusECore::MidiPlayEvent&);
       virtual const char* getPatchName (int, int, int, bool) const;
       virtual const MidiPatch* getPatchInfo(int, const MidiPatch *) const;
       virtual void getInitData(int*, const unsigned char**);
diff --git a/muse2/synti/fluid/fluidgui.cpp b/muse2/synti/fluid/fluidgui.cpp
index 9c13e81f..ec1c77b7 100644
--- a/muse2/synti/fluid/fluidgui.cpp
+++ b/muse2/synti/fluid/fluidgui.cpp
@@ -50,7 +50,7 @@ FLUIDGui::FLUIDGui()
       QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
       connect(s, SIGNAL(activated(int)), SLOT(readMessage(int)));
       
-      fdialogButton->setIcon(QIcon(*openIcon));
+      fdialogButton->setIcon(QIcon(*MusEGui::openIcon));
       connect(fdialogButton, SIGNAL(clicked()), SLOT(soundFontFileDialog()));
       connect(loadButton, SIGNAL(clicked()), SLOT(loadFont()));
 
@@ -102,10 +102,10 @@ void FLUIDGui::soundFontFileDialog()
             }
       }
 
-void FLUIDGui::processEvent(const MidiPlayEvent& ev) 
+void FLUIDGui::processEvent(const MusECore::MidiPlayEvent& ev) 
 {
       // p4.0.27 
-      if (ev.type() == ME_SYSEX)   {
+      if (ev.type() == MusECore::ME_SYSEX)   {
             const unsigned char* data = ev.data();
             switch (*data) {
                   case FS_SEND_SOUNDFONT_NAME: {
diff --git a/muse2/synti/fluid/fluidgui.h b/muse2/synti/fluid/fluidgui.h
index 87bc6b24..e3cec499 100644
--- a/muse2/synti/fluid/fluidgui.h
+++ b/muse2/synti/fluid/fluidgui.h
@@ -48,7 +48,7 @@ class FLUIDGui : public QDialog, public Ui::FLUIDGuiBase, public MessGui {
 
    public:
       FLUIDGui();
-      virtual void processEvent(const MidiPlayEvent&);
+      virtual void processEvent(const MusECore::MidiPlayEvent&);
       };
 
 #endif