merged namespace changes. HOPEFULLY the last one.

1 files changed, 12 insertions, 3 deletions

diff --git a/muse2/muse/track.h b/muse2/muse/track.h
index 7ed30914..9d3db8af 100644
--- a/muse2/muse/track.h
+++ b/muse2/muse/track.h
@@ -37,14 +37,16 @@
 #include "globaldefs.h"
 #include "cleftypes.h"
 
+namespace MusECore {
+class MPEventList;
 class Pipeline;
-class Xml;
+class PluginI;
 class SndFile;
-class MPEventList;
 class SynthI;
-class PluginI;
+class Xml;
 class DrumMap;
 
+
 //---------------------------------------------------------
 //   Track
 //---------------------------------------------------------
@@ -304,6 +306,10 @@ class MidiTrack : public Track {
       bool* drummap_hidden() { return _drummap_hidden; }
       };
 
+} // namespace MusECore
+
+namespace MusECore {
+
 //---------------------------------------------------------
 //   AudioTrack
 //    this track can hold audio automation data and can
@@ -566,6 +572,7 @@ class AudioAux : public AudioTrack {
       static bool visible() { return _isVisible; }
     };
 
+
 //---------------------------------------------------------
 //   WaveTrack
 //---------------------------------------------------------
@@ -734,5 +741,7 @@ typedef tracklist<SynthI*> SynthIList;
 extern void addPortCtrlEvents(MidiTrack* t);
 extern void removePortCtrlEvents(MidiTrack* t);
 
+} // namespace MusECore
+
 #endif