Removed more namespace artifacts.

3 files changed, 14 insertions, 14 deletions

diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index 0ed6b1b3..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)
@@ -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++)
   {
diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp
index 874e2a9a..01e8243b 100644
--- a/muse2/muse/plugin.cpp
+++ b/muse2/muse/plugin.cpp
@@ -2557,7 +2557,7 @@ void PluginI::apply(unsigned long n)
           // Set the ladspa control port value.
           controls[k].tmpVal = v.value;
           
-          // Need to update the MusEGlobal::automation value, otherwise it overwrites later with the last MusEGlobal::automation value.
+          // Need to update the automation value, otherwise it overwrites later with the last automation value.
           if(_track && _id != -1)
           {
             // Since we are now in the audio thread context, there's no need to send a message,
@@ -2567,7 +2567,7 @@ void PluginI::apply(unsigned long n)
             //audio->msgSetPluginCtrlVal(_track, genACnum(_id, k), controls[k].val);
             _track->setPluginCtrlVal(genACnum(_id, k), v.value);
             
-            // Record MusEGlobal::automation.
+            // Record automation.
             // NO! Take care of this immediately in the OSC control handler, because we don't want 
             //  the silly delay associated with processing the fifo one-at-a-time here.
             
@@ -2583,7 +2583,7 @@ void PluginI::apply(unsigned long n)
         else
         #endif // OSC_SUPPORT
         {
-          // Process MusEGlobal::automation control value.
+          // Process automation control value.
           if(MusEGlobal::automation && _track && _track->automationType() != AUTO_OFF && _id != -1)
           {
             if(controls[k].enCtrl && controls[k].en2Ctrl )
@@ -2650,7 +2650,7 @@ void PluginI::apply(unsigned long n, unsigned long ports, float** bufIn, float**
       if(min_per > n)
         min_per = n;
       
-      // Process MusEGlobal::automation control values now.
+      // Process automation control values now.
       // TODO: This needs to be respect frame resolution. Put this inside the sample loop below.
       if(MusEGlobal::automation && _track && _track->automationType() != AUTO_OFF && _id != -1)
       {
@@ -2725,7 +2725,7 @@ void PluginI::apply(unsigned long n, unsigned long ports, float** bufIn, float**
           controls[v.idx].tmpVal = v.value;
           
           /*
-          // Need to update the MusEGlobal::automation value, otherwise it overwrites later with the last MusEGlobal::automation value.
+          // Need to update the automation value, otherwise it overwrites later with the last MusEGlobal::automation value.
           if(_track && _id != -1)
           {
             // Since we are now in the audio thread context, there's no need to send a message,
@@ -2735,11 +2735,11 @@ void PluginI::apply(unsigned long n, unsigned long ports, float** bufIn, float**
             //audio->msgSetPluginCtrlVal(_track, genACnum(_id, k), controls[k].val);
             _track->setPluginCtrlVal(genACnum(_id, v.idx), v.value);
             
-            // Record MusEGlobal::automation.
+            // Record automation.
             // NO! Take care of this immediately in the OSC control handler, because we don't want 
             //  any delay.
             // OTOH Since this is the actual place and time where the control ports values
-            //  are set, best to reflect what happens here to MusEGlobal::automation.
+            //  are set, best to reflect what happens here to automation.
             // However for dssi-vst it might be best to handle it that way.
             
             //AutomationType at = _track->automationType();
@@ -3019,7 +3019,7 @@ int PluginI::oscControl(unsigned long port, float value)
   }
   
    
-  // Record MusEGlobal::automation:
+  // Record automation:
   // Take care of this immediately, because we don't want the silly delay associated with 
   //  processing the fifo one-at-a-time in the apply().
   // NOTE: With some vsts we don't receive control events until the user RELEASES a control. 
diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp
index bec5aabc..e5381884 100644
--- a/muse2/muse/song.cpp
+++ b/muse2/muse/song.cpp
@@ -2634,7 +2634,7 @@ int Song::execAutomationCtlPopup(AudioTrack* track, const QPoint& menupos, int a
   eraseRangeAction->setData(CLEAR_RANGE);
   eraseRangeAction->setEnabled(canEraseRange);
 
-  QAction* clearAction = menu->addAction(tr("clear MusEGlobal::automation"));
+  QAction* clearAction = menu->addAction(tr("clear automation"));
   clearAction->setData(CLEAR_ALL_EVENTS);
   clearAction->setEnabled((bool)count);
 
@@ -2817,7 +2817,7 @@ int Song::execMidiAutomationCtlPopup(MidiTrack* track, MidiPart* part, const QPo
 //  menu->insertItem(tr("erase range"), CLEAR_RANGE, CLEAR_RANGE);
 //  menu->setItemEnabled(CLEAR_RANGE, canEraseRange);
 
-//  menu->insertItem(tr("clear MusEGlobal::automation"), CLEAR_ALL_EVENTS, CLEAR_ALL_EVENTS);
+//  menu->insertItem(tr("clear automation"), CLEAR_ALL_EVENTS, CLEAR_ALL_EVENTS);
 //  menu->setItemEnabled(CLEAR_ALL_EVENTS, (bool)count);