introducing namespaces

8 files changed, 73 insertions, 69 deletions

diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 5b03f854..0aa246a2 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -45,7 +45,9 @@
 #include "gconfig.h"
 #include "xml.h"
 
+namespace MusEApp {
 extern QActionGroup* populateAddTrack(QMenu* addTrack);
+}
 
 #define __WIDTH_COMPENSATION 4
 
@@ -158,7 +160,7 @@ bool ScrollArea::viewportEvent(QEvent* event)
 //    inputs | synthis | tracks | groups | master
 //---------------------------------------------------------
 
-AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
+AudioMixerApp::AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c)
    : QMainWindow(parent)
       {
       cfg = c;
@@ -169,7 +171,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
       setWindowIcon(*museIcon);
 
       QMenu* menuConfig = menuBar()->addMenu(tr("&Create"));
-      populateAddTrack(menuConfig);
+      MusEApp::populateAddTrack(menuConfig);
       
       QMenu* menuView = menuBar()->addMenu(tr("&View"));
       routingId = menuView->addAction(tr("Routing"), this, SLOT(toggleRouteDialog()));
@@ -234,7 +236,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
       ///connect(this, SIGNAL(layoutRequest()), SLOT(setSizing()));  
       
       connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
-      connect(muse, SIGNAL(configChanged()), SLOT(configChanged()));
+      connect(MusEGlobal::muse, SIGNAL(configChanged()), SLOT(configChanged()));
       song->update();  // calls update mixer
       }
 
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index 28066ba3..1726ba7b 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -48,7 +48,9 @@ class ComboBox;
 class RouteDialog;
 class Strip;
 
+namespace MusEConfig {
 struct MixerConfig;
+}
 
 #define EFX_HEIGHT     16
 
@@ -80,7 +82,7 @@ class AudioMixerApp : public QMainWindow {
       Q_OBJECT
     
       //QString name;
-      MixerConfig* cfg;
+      MusEConfig::MixerConfig* cfg;
       StripList stripList;
       QScrollArea* view;
       QWidget* central;
@@ -138,7 +140,7 @@ class AudioMixerApp : public QMainWindow {
    
    public:
       //AudioMixerApp(QWidget* parent);
-      AudioMixerApp(QWidget* parent, MixerConfig* c);
+      AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c);
       //void write(Xml&, const char* name);
       //void write(int level, Xml& xml, const char* name);
       void write(int level, Xml& xml);
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 34ee77d7..11927e25 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -132,7 +132,7 @@ void AudioStrip::songChanged(int val)
     
       AudioTrack* src = (AudioTrack*)track;
       
-      // Do channels before config...
+      // Do channels before MusEConfig::config...
       if (val & SC_CHANNELS)
         updateChannels();
       
@@ -142,12 +142,12 @@ void AudioStrip::songChanged(int val)
         // Added by Tim. p3.3.9
         
         // Set the strip label's font.
-        //label->setFont(config.fonts[1]);
+        //label->setFont(MusEConfig::config.fonts[1]);
         setLabelFont();
         
         // Adjust minimum volume slider and label values.
-        slider->setRange(config.minSlider-0.1, 10.0);
-        sl->setRange(config.minSlider, 10.0);
+        slider->setRange(MusEConfig::config.minSlider-0.1, 10.0);
+        sl->setRange(MusEConfig::config.minSlider, 10.0);
         
         // Adjust minimum aux knob and label values.
         int n = auxKnob.size();
@@ -155,15 +155,15 @@ void AudioStrip::songChanged(int val)
         {
           auxKnob[idx]->blockSignals(true);
           auxLabel[idx]->blockSignals(true);
-          auxKnob[idx]->setRange(config.minSlider-0.1, 10.0);
-          auxLabel[idx]->setRange(config.minSlider, 10.1);
+          auxKnob[idx]->setRange(MusEConfig::config.minSlider-0.1, 10.0);
+          auxLabel[idx]->setRange(MusEConfig::config.minSlider, 10.1);
           auxKnob[idx]->blockSignals(false);
           auxLabel[idx]->blockSignals(false);
         }
         
         // Adjust minimum meter values.
         for(int c = 0; c < channel; ++c) 
-          meter[c]->setRange(config.minMeter, 10.0);
+          meter[c]->setRange(MusEConfig::config.minMeter, 10.0);
       }
       
       if (mute && (val & SC_MUTE)) {      // mute && off
@@ -388,7 +388,7 @@ void AudioStrip::stereoToggled(bool val)
 void AudioStrip::auxChanged(double val, int idx)
       {
       double vol;
-      if (val <= config.minSlider) {
+      if (val <= MusEConfig::config.minSlider) {
             vol = 0.0;
             val -= 1.0; // display special value "off"
             }
@@ -420,7 +420,7 @@ void AudioStrip::volumeChanged(double val)
         track->enableVolumeController(false);
       
       double vol;
-      if (val <= config.minSlider) {
+      if (val <= MusEConfig::config.minSlider) {
             vol = 0.0;
             val -= 1.0; // display special value "off"
             }
@@ -450,7 +450,7 @@ void AudioStrip::volumePressed()
       
       double val = slider->value();
       double vol;
-      if (val <= config.minSlider) {
+      if (val <= MusEConfig::config.minSlider) {
             vol = 0.0;
             //val -= 1.0; // display special value "off"
             }
@@ -496,7 +496,7 @@ void AudioStrip::volLabelChanged(double val)
         track->enableVolumeController(false);
       
       double vol;
-      if (val <= config.minSlider) {
+      if (val <= MusEConfig::config.minSlider) {
             vol = 0.0;
             val -= 1.0; // display special value "off"
             }
@@ -602,8 +602,8 @@ void AudioStrip::updateChannels()
       if (c > channel) {
             for (int cc = channel; cc < c; ++cc) {
                   meter[cc] = new Meter(this);
-                  //meter[cc]->setRange(config.minSlider, 10.0);
-                  meter[cc]->setRange(config.minMeter, 10.0);
+                  //meter[cc]->setRange(MusEConfig::config.minSlider, 10.0);
+                  meter[cc]->setRange(MusEConfig::config.minMeter, 10.0);
                   meter[cc]->setFixedWidth(15);
                   connect(meter[cc], SIGNAL(mousePress()), this, SLOT(resetPeaks()));
                   sliderGrid->addWidget(meter[cc], 0, cc+1, Qt::AlignLeft);
@@ -636,7 +636,7 @@ Knob* AudioStrip::addKnob(int type, int id, DoubleLabel** dlabel)
       if (type == 0)
             knob->setRange(-1.0, +1.0);
       else
-            knob->setRange(config.minSlider-0.1, 10.0);
+            knob->setRange(MusEConfig::config.minSlider-0.1, 10.0);
       knob->setBackgroundRole(QPalette::Mid);
 
       if (type == 0)
@@ -648,12 +648,12 @@ Knob* AudioStrip::addKnob(int type, int id, DoubleLabel** dlabel)
       if (type == 0)
             pl = new DoubleLabel(0, -1.0, +1.0, this);
       else
-            pl = new DoubleLabel(0.0, config.minSlider, 10.1, this);
+            pl = new DoubleLabel(0.0, MusEConfig::config.minSlider, 10.1, this);
             
       if (dlabel)
             *dlabel = pl;
       pl->setSlider(knob);
-      pl->setFont(config.fonts[1]);
+      pl->setFont(MusEConfig::config.fonts[1]);
       pl->setBackgroundRole(QPalette::Mid);
       pl->setFrame(true);
       if (type == 0)
@@ -670,7 +670,7 @@ Knob* AudioStrip::addKnob(int type, int id, DoubleLabel** dlabel)
             label.sprintf("Aux%d", id+1);
 
       QLabel* plb = new QLabel(label, this);
-      plb->setFont(config.fonts[1]);
+      plb->setFont(MusEConfig::config.fonts[1]);
       plb->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       plb->setAlignment(Qt::AlignCenter);
 
@@ -750,7 +750,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       //---------------------------------------------------
 
       stereo  = new QToolButton();
-      stereo->setFont(config.fonts[1]);
+      stereo->setFont(MusEConfig::config.fonts[1]);
       QIcon stereoSet;
       stereoSet.addPixmap(*monoIcon, QIcon::Normal, QIcon::Off);
       stereoSet.addPixmap(*stereoIcon, QIcon::Normal, QIcon::On);
@@ -768,7 +768,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
             stereo->setEnabled(false);
 
       pre = new QToolButton();
-      pre->setFont(config.fonts[1]);
+      pre->setFont(MusEConfig::config.fonts[1]);
       pre->setCheckable(true);
       pre->setText(tr("Pre"));
       pre->setToolTip(tr("pre fader - post fader"));
@@ -813,16 +813,16 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       slider = new Slider(this, "vol", Qt::Vertical, Slider::None);
 
       slider->setCursorHoming(true);
-      slider->setRange(config.minSlider-0.1, 10.0);
+      slider->setRange(MusEConfig::config.minSlider-0.1, 10.0);
       slider->setFixedWidth(20);
-      slider->setFont(config.fonts[1]);
+      slider->setFont(MusEConfig::config.fonts[1]);
       slider->setValue(fast_log10(t->volume())*20.0);
 
       sliderGrid->addWidget(slider, 0, 0, Qt::AlignHCenter);
 
       for (int i = 0; i < channel; ++i) {
-            //meter[i]->setRange(config.minSlider, 10.0);
-            meter[i]->setRange(config.minMeter, 10.0);
+            //meter[i]->setRange(MusEConfig::config.minSlider, 10.0);
+            meter[i]->setRange(MusEConfig::config.minMeter, 10.0);
             meter[i]->setFixedWidth(15);
             connect(meter[i], SIGNAL(mousePress()), this, SLOT(resetPeaks()));
             sliderGrid->addWidget(meter[i], 0, i+1, Qt::AlignHCenter);
@@ -831,9 +831,9 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       sliderGrid->addItem(new QSpacerItem(2,0),0,3);
       grid->addLayout(sliderGrid, _curGridRow++, 0, 1, 2); 
 
-      sl = new DoubleLabel(0.0, config.minSlider, 10.0, this);
+      sl = new DoubleLabel(0.0, MusEConfig::config.minSlider, 10.0, this);
       sl->setSlider(slider);
-      sl->setFont(config.fonts[1]);
+      sl->setFont(MusEConfig::config.fonts[1]);
       sl->setBackgroundRole(QPalette::Mid);
       sl->setSuffix(tr("dB"));
       sl->setFrame(true);
@@ -945,7 +945,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
 
       if (type != Track::AUDIO_AUX) {
             iR = new QToolButton();
-            iR->setFont(config.fonts[1]);
+            iR->setFont(MusEConfig::config.fonts[1]);
             iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
             iR->setText(tr("iR"));
             iR->setCheckable(false);
@@ -955,7 +955,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
             }
       
       oR = new QToolButton();
-      oR->setFont(config.fonts[1]);
+      oR->setFont(MusEConfig::config.fonts[1]);
       oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       oR->setText(tr("oR"));
       oR->setCheckable(false);
@@ -968,7 +968,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
       //---------------------------------------------------
 
       autoType = new ComboBox();
-      autoType->setFont(config.fonts[1]);
+      autoType->setFont(MusEConfig::config.fonts[1]);
       autoType->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       
       autoType->addAction(tr("Off"), AUTO_OFF);
@@ -1016,7 +1016,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
             updateOffState();   // init state
             off->blockSignals(false);
             }
-      connect(heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
+      connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
       }
 
 //---------------------------------------------------------
@@ -1025,7 +1025,7 @@ AudioStrip::AudioStrip(QWidget* parent, AudioTrack* at)
 
 void AudioStrip::iRoutePressed()
       {
-      RoutePopupMenu* pup = muse->getRoutingPopupMenu();
+      RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
       iR->setDown(false);     
       pup->exec(QCursor::pos(), track, false);
       }
@@ -1036,7 +1036,7 @@ void AudioStrip::iRoutePressed()
 
 void AudioStrip::oRoutePressed()
 {
-      RoutePopupMenu* pup = muse->getRoutingPopupMenu();
+      RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
       oR->setDown(false);     
       pup->exec(QCursor::pos(), track, true);
 }
diff --git a/muse2/muse/mixer/auxknob.cpp b/muse2/muse/mixer/auxknob.cpp
index 1c358b17..d770fe7b 100644
--- a/muse2/muse/mixer/auxknob.cpp
+++ b/muse2/muse/mixer/auxknob.cpp
@@ -33,7 +33,7 @@ AuxKnob::AuxKnob(QWidget* parent, int i)
    : Knob(parent, "aux")
       {
       idx = i;
-      setRange(config.minSlider-0.1, 10.0);
+      setRange(MusEConfig::config.minSlider-0.1, 10.0);
       connect(this, SIGNAL(valueChanged(double,int)), SLOT(valueChanged(double)));
       }
 
@@ -44,7 +44,7 @@ AuxKnob::AuxKnob(QWidget* parent, int i)
 void AuxKnob::valueChanged(double val)
       {
       double vol;
-      if (val <= config.minSlider) {
+      if (val <= MusEConfig::config.minSlider) {
             vol = 0.0;
             val -= 1.0; // display special value "off"
             }
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index e3064208..17d21b21 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -107,7 +107,7 @@ void MidiStrip::addKnob(int idx, const QString& tt, const QString& label,
       dl->setSpecialText(tr("off"));
       dl->setToolTip(tr("double click on/off"));
       controller[idx].dl = dl;
-      dl->setFont(config.fonts[1]);
+      dl->setFont(MusEConfig::config.fonts[1]);
       dl->setBackgroundRole(QPalette::Mid);
       dl->setFrame(true);
       dl->setPrecision(0);
@@ -150,7 +150,7 @@ void MidiStrip::addKnob(int idx, const QString& tt, const QString& label,
       
       QLabel* lb = new QLabel(label, this);
       controller[idx].lb = lb;
-      lb->setFont(config.fonts[1]);
+      lb->setFont(MusEConfig::config.fonts[1]);
       lb->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       lb->setAlignment(Qt::AlignCenter);
       lb->setEnabled(enabled);
@@ -208,7 +208,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       slider->setCursorHoming(true);
       slider->setRange(double(mn), double(mx), 1.0);
       slider->setFixedWidth(20);
-      slider->setFont(config.fonts[1]);
+      slider->setFont(MusEConfig::config.fonts[1]);
       slider->setId(CTRL_VOLUME);
 
       meter[0] = new Meter(this, Meter::LinMeter);
@@ -223,7 +223,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       grid->addLayout(sliderGrid, _curGridRow++, 0, 1, 2); 
 
       sl = new DoubleLabel(0.0, -98.0, 0.0, this);
-      sl->setFont(config.fonts[1]);
+      sl->setFont(MusEConfig::config.fonts[1]);
       sl->setBackgroundRole(QPalette::Mid);
       sl->setSpecialText(tr("off"));
       sl->setSuffix(tr("dB"));
@@ -367,10 +367,10 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       dcs.sprintf("%d-%d", port + 1, channel + 1);
       dev_ch_label->setText(dcs);
       //dev_ch_label->setBackgroundColor(QColor(0, 160, 255)); // Med blue
-      //dev_ch_label->setFont(config.fonts[6]);
-      dev_ch_label->setFont(config.fonts[1]);
+      //dev_ch_label->setFont(MusEConfig::config.fonts[6]);
+      dev_ch_label->setFont(MusEConfig::config.fonts[1]);
       // Dealing with a horizontally constrained label. Ignore vertical. Use a minimum readable point size.
-      //autoAdjustFontSize(dev_ch_label, dev_ch_label->text(), false, true, config.fonts[6].pointSize(), 5);
+      //autoAdjustFontSize(dev_ch_label, dev_ch_label->text(), false, true, MusEConfig::config.fonts[6].pointSize(), 5);
       QToolTip::add(dev_ch_label, tr("output port and channel"));
       */
       
@@ -397,7 +397,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       //---------------------------------------------------
 
       iR = new QToolButton();
-      iR->setFont(config.fonts[1]);
+      iR->setFont(MusEConfig::config.fonts[1]);
       iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       iR->setText(tr("iR"));
       iR->setCheckable(false);
@@ -405,7 +405,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       grid->addWidget(iR, _curGridRow, 0);
       connect(iR, SIGNAL(pressed()), SLOT(iRoutePressed()));
       oR = new QToolButton();
-      oR->setFont(config.fonts[1]);
+      oR->setFont(MusEConfig::config.fonts[1]);
       oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       oR->setText(tr("oR"));
       oR->setCheckable(false);
@@ -421,7 +421,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       //---------------------------------------------------
 
       autoType = new ComboBox();
-      autoType->setFont(config.fonts[1]);
+      autoType->setFont(MusEConfig::config.fonts[1]);
       autoType->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
       autoType->setEnabled(false);
       
@@ -436,7 +436,7 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       //connect(autoType, SIGNAL(activated(int)), SLOT(setAutomationType(int)));
 
       grid->addWidget(autoType, _curGridRow++, 0, 1, 2);
-      connect(heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
+      connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
       inHeartBeat = false;
       }
 
@@ -520,7 +520,7 @@ void MidiStrip::songChanged(int val)
       if (val & SC_CONFIG)
       {
         // Set the strip label's font.
-        //label->setFont(config.fonts[1]);
+        //label->setFont(MusEConfig::config.fonts[1]);
         setLabelFont();
       }  
     }
@@ -1012,7 +1012,7 @@ void MidiStrip::setReverbSend(double val)
 
 void MidiStrip::iRoutePressed()
 {
-  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
+  RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
   iR->setDown(false);     
   pup->exec(QCursor::pos(), track, false);
 }
@@ -1023,7 +1023,7 @@ void MidiStrip::iRoutePressed()
 
 void MidiStrip::oRoutePressed()
 {
-  RoutePopupMenu* pup = muse->getRoutingPopupMenu();
+  RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
   oR->setDown(false);     
   pup->exec(QCursor::pos(), track, true);
 }
diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp
index d32921d9..86c3ff77 100644
--- a/muse2/muse/mixer/rack.cpp
+++ b/muse2/muse/mixer/rack.cpp
@@ -159,7 +159,7 @@ EffectRack::EffectRack(QWidget* parent, AudioTrack* t)
       setAttribute(Qt::WA_DeleteOnClose);
       track = t;
       itemheight = 19;
-      setFont(config.fonts[1]);
+      setFont(MusEConfig::config.fonts[1]);
 
       setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
       setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -415,7 +415,7 @@ void EffectRack::doubleClicked(QListWidgetItem* it)
 void EffectRack::savePreset(int idx)
       {
       //QString name = getSaveFileName(QString(""), plug_file_pattern, this,
-      QString name = getSaveFileName(QString(""), preset_file_save_pattern, this,
+      QString name = getSaveFileName(QString(""), MusEGlobal::preset_file_save_pattern, this,
          tr("MusE: Save Preset"));
       
       if(name.isEmpty())
@@ -471,9 +471,9 @@ void EffectRack::startDrag(int idx)
             return;
         }
       FILE *tmp;
-      if (debugMsg) {
+      if (MusEGlobal::debugMsg) {
           QString fileName;
-          getUniqueTmpfileName("tmp","preset", fileName);
+          MusEGlobal::getUniqueTmpfileName("tmp","preset", fileName);
           tmp = fopen(fileName.toLatin1().data(), "w+");
       }
       else
diff --git a/muse2/muse/mixer/routedialog.cpp b/muse2/muse/mixer/routedialog.cpp
index 2a37c310..53b8d48b 100644
--- a/muse2/muse/mixer/routedialog.cpp
+++ b/muse2/muse/mixer/routedialog.cpp
@@ -101,7 +101,7 @@ void RouteDialog::routingChanged()
                   new QTreeWidgetItem(routeList, QStringList() << src << r->name());
                   }
             }
-      if (!checkAudioDevice()) return;
+      if (!MusEGlobal::checkAudioDevice()) return;
       std::list<QString> sl = audioDevice->outputPorts();
       for (std::list<QString>::iterator i = sl.begin(); i != sl.end(); ++i)
             newSrcList->addItem(*i);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index ba28c040..8f899c13 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -69,7 +69,7 @@ void Strip::recordToggled(bool val)
       {
       if (track->type() == Track::AUDIO_OUTPUT) {
             if (val && track->recordFlag() == false) {
-                  muse->bounceToFile((AudioOutput*)track);
+                  MusEGlobal::muse->bounceToFile((AudioOutput*)track);
                   }
             audio->msgSetRecord((AudioOutput*)track, val);
             if (!((AudioOutput*)track)->recFile())
@@ -95,9 +95,9 @@ void Strip::setLabelFont()
 {
   // Use the new font #6 I created just for these labels (so far).
   // Set the label's font.
-  label->setFont(config.fonts[6]);
+  label->setFont(MusEConfig::config.fonts[6]);
   // Dealing with a horizontally constrained label. Ignore vertical. Use a minimum readable point size.
-  autoAdjustFontSize(label, label->text(), false, true, config.fonts[6].pointSize(), 5); 
+  autoAdjustFontSize(label, label->text(), false, true, MusEConfig::config.fonts[6].pointSize(), 5); 
 }
 
 //---------------------------------------------------------
@@ -110,35 +110,35 @@ void Strip::setLabelText()
       switch(track->type()) {
             case Track::AUDIO_OUTPUT:
                   //c = Qt::green;
-                  c = config.outputTrackLabelBg;
+                  c = MusEConfig::config.outputTrackLabelBg;
                   break;
             case Track::AUDIO_GROUP:
                   //c = Qt::yellow;
-                  c = config.groupTrackLabelBg;
+                  c = MusEConfig::config.groupTrackLabelBg;
                   break;
             case Track::AUDIO_AUX:
                   //c = QColor(120, 255, 255);   // Light blue
-                  c = config.auxTrackLabelBg;
+                  c = MusEConfig::config.auxTrackLabelBg;
                   break;
             case Track::WAVE:
                   //c = Qt::magenta;
-                  c = config.waveTrackLabelBg;
+                  c = MusEConfig::config.waveTrackLabelBg;
                   break;
             case Track::AUDIO_INPUT:
                   //c = Qt::red;
-                  c = config.inputTrackLabelBg;
+                  c = MusEConfig::config.inputTrackLabelBg;
                   break;
             case Track::AUDIO_SOFTSYNTH:
                   //c = QColor(255, 130, 0);  // Med orange
-                  c = config.synthTrackLabelBg;
+                  c = MusEConfig::config.synthTrackLabelBg;
                   break;
             case Track::MIDI:
                   //c = QColor(0, 160, 255); // Med blue
-                  c = config.midiTrackLabelBg;
+                  c = MusEConfig::config.midiTrackLabelBg;
                   break;
             case Track::DRUM:
                   //c = QColor(0, 160, 255); // Med blue
-                  c = config.drumTrackLabelBg;
+                  c = MusEConfig::config.drumTrackLabelBg;
                   break;
             default:
                   return;      
@@ -222,7 +222,7 @@ Strip::Strip(QWidget* parent, Track* t)
       
       // Moved by Tim. p3.3.9
       //setLabelText();
-      //label->setFont(config.fonts[1]);
+      //label->setFont(MusEConfig::config.fonts[1]);
       
       //printf("Strip::Strip w:%d frw:%d layoutmarg:%d lx:%d ly:%d lw:%d lh:%d\n", STRIP_WIDTH, frameWidth(), layout->margin(), label->x(), label->y(), label->width(), label->height());