clean residual namespace work. fix python control build.

7 files changed, 24 insertions, 7 deletions

diff --git a/muse2/muse/driver/alsamidi.h b/muse2/muse/driver/alsamidi.h
index 832d86d7..2054a7d3 100644
--- a/muse2/muse/driver/alsamidi.h
+++ b/muse2/muse/driver/alsamidi.h
@@ -45,8 +45,8 @@ class MidiAlsaDevice : public MidiDevice {
    private:
       // Special for ALSA midi device: Play event list is processed in the ALSA midi sequencer thread.
       // Need this FIFO, to decouple from audio thread which adds events to the list.       
-      MusECore::MidiFifo playEventFifo;  
-      MusECore::MidiFifo stuckNotesFifo;  
+      MidiFifo playEventFifo;  
+      MidiFifo stuckNotesFifo;  
       volatile bool stopPending;         
       volatile bool seekPending;
       
@@ -57,7 +57,7 @@ class MidiAlsaDevice : public MidiDevice {
       virtual int selectWfd();
 
       bool putEvent(snd_seq_event_t*);
-      virtual bool putMidiEvent(const MusECore::MidiPlayEvent&);
+      virtual bool putMidiEvent(const MidiPlayEvent&);
 
    public:
       MidiAlsaDevice(const snd_seq_addr_t&, const QString& name);
@@ -69,9 +69,9 @@ class MidiAlsaDevice : public MidiDevice {
       virtual void writeRouting(int, Xml&) const;
       virtual inline int deviceType() const { return ALSA_MIDI; } 
       // Schedule an event for playback. Returns false if event cannot be delivered.
-      virtual bool addScheduledEvent(const MusECore::MidiPlayEvent& ev) { return !playEventFifo.put(ev); }
+      virtual bool addScheduledEvent(const MidiPlayEvent& ev) { return !playEventFifo.put(ev); }
       // Add a stuck note. Returns false if event cannot be delivered.
-      virtual bool addStuckNote(const MusECore::MidiPlayEvent& ev) { return !stuckNotesFifo.put(ev); }
+      virtual bool addStuckNote(const MidiPlayEvent& ev) { return !stuckNotesFifo.put(ev); }
       // Play all events up to current frame.
       virtual void processMidi();
       virtual void handleStop();
diff --git a/muse2/muse/driver/alsatimer.cpp b/muse2/muse/driver/alsatimer.cpp
index dee661fe..ee72d679 100644
--- a/muse2/muse/driver/alsatimer.cpp
+++ b/muse2/muse/driver/alsatimer.cpp
@@ -28,6 +28,8 @@
   #include <climits>
 
 #define TIMER_DEBUG 0
+
+namespace MusECore {
   
   AlsaTimer::AlsaTimer()
      {
@@ -238,3 +240,5 @@
       }
     return tr.ticks;
     }
+
+} // namespace MusECore
diff --git a/muse2/muse/driver/alsatimer.h b/muse2/muse/driver/alsatimer.h
index b906c02d..79e9193e 100644
--- a/muse2/muse/driver/alsatimer.h
+++ b/muse2/muse/driver/alsatimer.h
@@ -30,6 +30,7 @@
 #include "alsa/asoundlib.h"
 #include "timerdev.h"
 
+namespace MusECore {
 
 //---------------------------------------------------------
 //   AlsaTimer
@@ -64,4 +65,6 @@ class AlsaTimer : public Timer{
        void setFindBestTimer(bool b) { findBest = b; }
 };
 
+} // namespace MusECore
+
 #endif //__ALSATIMER_H__
diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp
index 542c68ba..733353d8 100644
--- a/muse2/muse/driver/jack.cpp
+++ b/muse2/muse/driver/jack.cpp
@@ -2234,8 +2234,8 @@ void exitJackAudio()
       {
       if (JACK_DEBUG)
             printf("exitJackAudio()\n");
-      if (MusECore::jackAudio)
-            delete MusECore::jackAudio;
+      if (jackAudio)
+            delete jackAudio;
             
       if (JACK_DEBUG)
             printf("exitJackAudio() after delete jackAudio\n");
diff --git a/muse2/muse/driver/rtctimer.cpp b/muse2/muse/driver/rtctimer.cpp
index fd0fe8ed..365b8501 100644
--- a/muse2/muse/driver/rtctimer.cpp
+++ b/muse2/muse/driver/rtctimer.cpp
@@ -41,6 +41,7 @@
 #include "globals.h"
 #include "gconfig.h"
 
+namespace MusECore {
 
 RtcTimer::RtcTimer()
     {
@@ -168,3 +169,5 @@ unsigned int RtcTimer::getTimerTicks(bool /*printTicks*/)// prevent compiler war
         }
     return nn;
     }
+
+} // namespace MusECore
diff --git a/muse2/muse/driver/rtctimer.h b/muse2/muse/driver/rtctimer.h
index 5befdf22..425ea643 100644
--- a/muse2/muse/driver/rtctimer.h
+++ b/muse2/muse/driver/rtctimer.h
@@ -29,6 +29,7 @@
 
 #include "timerdev.h"
 
+namespace MusECore {
 
 //---------------------------------------------------------
 //   AlsaTimer
@@ -56,4 +57,6 @@ class RtcTimer : public Timer{
 
 };
 
+} // namespace MusECore
+
 #endif //__ALSATIMER_H__
diff --git a/muse2/muse/driver/timerdev.h b/muse2/muse/driver/timerdev.h
index 960cf2f4..56f9216e 100644
--- a/muse2/muse/driver/timerdev.h
+++ b/muse2/muse/driver/timerdev.h
@@ -31,6 +31,8 @@
 
 #define TIMER_DEBUG 0
 
+namespace MusECore {
+
 //---------------------------------------------------------
 //   AlsaTimer
 //---------------------------------------------------------
@@ -53,4 +55,6 @@ class Timer {
         
 };
 
+} // namespace MusECore
+
 #endif //__ALSATIMER_H__