merged again. please continue developing the deep changes HERE. thanks

1 files changed, 6 insertions, 6 deletions

diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index 551b640d..1db8dda3 100644
--- a/muse2/muse/audiotrack.cpp
+++ b/muse2/muse/audiotrack.cpp
@@ -565,10 +565,10 @@ void AudioTrack::processAutomationEvents()
     }
   }
   
-  // Done with the recorded MusEGlobal::automation event list. Clear it.
+  // Done with the recorded automation event list. Clear it.
   _recEvents.clear();
         
-  // Try muse without this, so that the user can remain in MusEGlobal::automation write mode
+  // Try muse without this, so that the user can remain in automation write mode
   //  after a stop. 
   /*
   if (automationType() == AUTO_WRITE)
@@ -899,7 +899,7 @@ void AudioTrack::writeProperties(int level, Xml& xml) const
       Track::writeProperties(level, xml);
       xml.intTag(level, "prefader", prefader());
       xml.intTag(level, "sendMetronome", sendMetronome());
-      xml.intTag(level, "MusEGlobal::automation", int(automationType()));
+      xml.intTag(level, "automation", int(automationType()));
       if (hasAuxSend()) {
             int naux = song->auxs()->size();
             for (int idx = 0; idx < naux; ++idx) {
@@ -1003,7 +1003,7 @@ bool AudioTrack::readProperties(Xml& xml, const QString& tag)
             _prefader = xml.parseInt();
       else if (tag == "sendMetronome")
             _sendMetronome = xml.parseInt();
-      else if (tag == "MusEGlobal::automation")
+      else if (tag == "automation")
             setAutomationType(AutomationType(xml.parseInt()));
       // Removed by T356
       // "recfile" tag not saved anymore
@@ -1014,7 +1014,7 @@ bool AudioTrack::readProperties(Xml& xml, const QString& tag)
             l->read(xml);
 
             // Since (until now) muse wrote a 'zero' for plugin controller current value 
-            //  in the XML file, we can't use that value, now that plugin MusEGlobal::automation is added.
+            //  in the XML file, we can't use that value, now that plugin automation is added.
             // We must take the value from the plugin control value.
             // Otherwise we break all existing .med files with plugins, because the gui 
             //  controls would all be set to zero.
@@ -1138,7 +1138,7 @@ void AudioTrack::mapRackPluginsToControllers()
   // No matter of the outcome of the above - rack position is not too critical -
   //  making sure that each control has a controller is important. Otherwise they 
   //  are stuck at zero can't be adjusted.
-  // Muse med files created before the MusEGlobal::automation patches (before 0.9pre1) may have broken
+  // Muse med files created before the automation patches (before 0.9pre1) may have broken
   //  controller sections, so this will allow more tolerance of them.
   for(int idx = 0; idx < PipelineDepth; idx++)
   {