introducing namespaces

6 files changed, 74 insertions, 70 deletions

diff --git a/muse2/muse/mplugins/midifilterimpl.cpp b/muse2/muse/mplugins/midifilterimpl.cpp
index 89a3aba6..50dcd601 100644
--- a/muse2/muse/mplugins/midifilterimpl.cpp
+++ b/muse2/muse/mplugins/midifilterimpl.cpp
@@ -33,19 +33,19 @@
 
 void MidiFilterConfig::setCtrl1(int n)
       {
-      midiFilterCtrl1 = n-1;
+      MusEGlobal::midiFilterCtrl1 = n-1;
       }
 void MidiFilterConfig::setCtrl2(int n)
       {
-      midiFilterCtrl2 = n-1;
+      MusEGlobal::midiFilterCtrl2 = n-1;
       }
 void MidiFilterConfig::setCtrl3(int n)
       {
-      midiFilterCtrl3 = n-1;
+      MusEGlobal::midiFilterCtrl3 = n-1;
       }
 void MidiFilterConfig::setCtrl4(int n)
       {
-      midiFilterCtrl4 = n-1;
+      MusEGlobal::midiFilterCtrl4 = n-1;
       }
 
 
@@ -57,18 +57,18 @@ MidiFilterConfig::MidiFilterConfig(QDialog* parent)
   : QDialog(parent)
       {
       setupUi(this);
-      cb1->setCurrentIndex(midiFilterCtrl1);
-      cb2->setCurrentIndex(midiFilterCtrl2);
-      cb3->setCurrentIndex(midiFilterCtrl3);
-      cb4->setCurrentIndex(midiFilterCtrl4);
-
-      rf1->setChecked(midiRecordType & 1);
-      rf2->setChecked(midiRecordType & 2);
-      rf3->setChecked(midiRecordType & 4);
-      rf4->setChecked(midiRecordType & 8);
-      rf5->setChecked(midiRecordType & 16);
-      rf6->setChecked(midiRecordType & 32);
-      rf7->setChecked(midiRecordType & 64);
+      cb1->setCurrentIndex(MusEGlobal::midiFilterCtrl1);
+      cb2->setCurrentIndex(MusEGlobal::midiFilterCtrl2);
+      cb3->setCurrentIndex(MusEGlobal::midiFilterCtrl3);
+      cb4->setCurrentIndex(MusEGlobal::midiFilterCtrl4);
+
+      rf1->setChecked(MusEGlobal::midiRecordType & 1);
+      rf2->setChecked(MusEGlobal::midiRecordType & 2);
+      rf3->setChecked(MusEGlobal::midiRecordType & 4);
+      rf4->setChecked(MusEGlobal::midiRecordType & 8);
+      rf5->setChecked(MusEGlobal::midiRecordType & 16);
+      rf6->setChecked(MusEGlobal::midiRecordType & 32);
+      rf7->setChecked(MusEGlobal::midiRecordType & 64);
       connect(rf1, SIGNAL(toggled(bool)), SLOT(recordChanged1(bool)));
       connect(rf2, SIGNAL(toggled(bool)), SLOT(recordChanged2(bool)));
       connect(rf3, SIGNAL(toggled(bool)), SLOT(recordChanged3(bool)));
@@ -77,13 +77,13 @@ MidiFilterConfig::MidiFilterConfig(QDialog* parent)
       connect(rf6, SIGNAL(toggled(bool)), SLOT(recordChanged6(bool)));
       connect(rf7, SIGNAL(toggled(bool)), SLOT(recordChanged7(bool)));
 
-      tf1->setChecked(midiThruType & 1);
-      tf2->setChecked(midiThruType & 2);
-      tf3->setChecked(midiThruType & 4);
-      tf4->setChecked(midiThruType & 8);
-      tf5->setChecked(midiThruType & 16);
-      tf6->setChecked(midiThruType & 32);
-      tf7->setChecked(midiThruType & 64);
+      tf1->setChecked(MusEGlobal::midiThruType & 1);
+      tf2->setChecked(MusEGlobal::midiThruType & 2);
+      tf3->setChecked(MusEGlobal::midiThruType & 4);
+      tf4->setChecked(MusEGlobal::midiThruType & 8);
+      tf5->setChecked(MusEGlobal::midiThruType & 16);
+      tf6->setChecked(MusEGlobal::midiThruType & 32);
+      tf7->setChecked(MusEGlobal::midiThruType & 64);
       connect(tf1, SIGNAL(toggled(bool)), SLOT(thruChanged1(bool)));
       connect(tf2, SIGNAL(toggled(bool)), SLOT(thruChanged2(bool)));
       connect(tf3, SIGNAL(toggled(bool)), SLOT(thruChanged3(bool)));
@@ -92,22 +92,22 @@ MidiFilterConfig::MidiFilterConfig(QDialog* parent)
       connect(tf6, SIGNAL(toggled(bool)), SLOT(thruChanged6(bool)));
       connect(tf7, SIGNAL(toggled(bool)), SLOT(thruChanged7(bool)));
 
-      cf1->setChecked(midiInputChannel  & 1);
-      cf2->setChecked(midiInputChannel  & 2);
-      cf3->setChecked(midiInputChannel  & 4);
-      cf4->setChecked(midiInputChannel  & 8);
-      cf5->setChecked(midiInputChannel  & 0x10);
-      cf6->setChecked(midiInputChannel  & 0x20);
-      cf7->setChecked(midiInputChannel  & 0x40);
-      cf8->setChecked(midiInputChannel  & 0x80);
-      cf9->setChecked(midiInputChannel  & 0x100);
-      cf10->setChecked(midiInputChannel & 0x200);
-      cf11->setChecked(midiInputChannel & 0x400);
-      cf12->setChecked(midiInputChannel & 0x800);
-      cf13->setChecked(midiInputChannel & 0x1000);
-      cf14->setChecked(midiInputChannel & 0x2000);
-      cf15->setChecked(midiInputChannel & 0x4000);
-      cf16->setChecked(midiInputChannel & 0x8000);
+      cf1->setChecked(MusEGlobal::midiInputChannel  & 1);
+      cf2->setChecked(MusEGlobal::midiInputChannel  & 2);
+      cf3->setChecked(MusEGlobal::midiInputChannel  & 4);
+      cf4->setChecked(MusEGlobal::midiInputChannel  & 8);
+      cf5->setChecked(MusEGlobal::midiInputChannel  & 0x10);
+      cf6->setChecked(MusEGlobal::midiInputChannel  & 0x20);
+      cf7->setChecked(MusEGlobal::midiInputChannel  & 0x40);
+      cf8->setChecked(MusEGlobal::midiInputChannel  & 0x80);
+      cf9->setChecked(MusEGlobal::midiInputChannel  & 0x100);
+      cf10->setChecked(MusEGlobal::midiInputChannel & 0x200);
+      cf11->setChecked(MusEGlobal::midiInputChannel & 0x400);
+      cf12->setChecked(MusEGlobal::midiInputChannel & 0x800);
+      cf13->setChecked(MusEGlobal::midiInputChannel & 0x1000);
+      cf14->setChecked(MusEGlobal::midiInputChannel & 0x2000);
+      cf15->setChecked(MusEGlobal::midiInputChannel & 0x4000);
+      cf16->setChecked(MusEGlobal::midiInputChannel & 0x8000);
 
       connect(cb1, SIGNAL(activated(int)), SLOT(setCtrl1(int)));
       connect(cb2, SIGNAL(activated(int)), SLOT(setCtrl2(int)));
diff --git a/muse2/muse/mplugins/midifilterimpl.h b/muse2/muse/mplugins/midifilterimpl.h
index 95f62d5c..de276f44 100644
--- a/muse2/muse/mplugins/midifilterimpl.h
+++ b/muse2/muse/mplugins/midifilterimpl.h
@@ -38,21 +38,21 @@ class MidiFilterConfig : public QDialog, public Ui::MidiFilterConfigBase {
 
       void rChanged(bool f, int val) {
             if (f)
-                  midiRecordType |= val;
+                  MusEGlobal::midiRecordType |= val;
             else
-                  midiRecordType &= ~val;
+                  MusEGlobal::midiRecordType &= ~val;
             }
       void tChanged(bool f, int val) {
             if (f)
-                  midiThruType |= val;
+                  MusEGlobal::midiThruType |= val;
             else
-                  midiThruType &= ~val;
+                  MusEGlobal::midiThruType &= ~val;
             }
       void chChanged(bool f, int val) {
             if (f)
-                  midiInputChannel |= val;
+                  MusEGlobal::midiInputChannel |= val;
             else
-                  midiInputChannel &= ~val;
+                  MusEGlobal::midiInputChannel &= ~val;
             }
       virtual void closeEvent(QCloseEvent*);
 
diff --git a/muse2/muse/mplugins/midiitransform.cpp b/muse2/muse/mplugins/midiitransform.cpp
index 4dd10b8c..8cc881ff 100644
--- a/muse2/muse/mplugins/midiitransform.cpp
+++ b/muse2/muse/mplugins/midiitransform.cpp
@@ -130,7 +130,7 @@ class MidiInputTransformation {
             procVal2a    = 0;
             procVal2b    = 0;
             funcOp       = Transform;
-            quantVal     = config.division;
+            quantVal     = MusEConfig::config.division;
             selPort      = Ignore;
             selChannel   = Ignore;
             selChannela  = 0;
@@ -177,7 +177,7 @@ bool applyMidiInputTransformation(MidiRecordEvent& event)
                   int rv = modules[i].transform->apply(event);
                   if (rv == 1)
                   {
-                        if(debugMsg)
+                      if(MusEGlobal::debugMsg)
                           printf("drop input event\n");
                   }      
                   if (rv)
@@ -1630,7 +1630,7 @@ void MidiInputTransformDialog::presetChanged(QListWidgetItem* item)
       iMidiInputTransformation i;
       for (i = mtlist.begin(); i != mtlist.end(); ++i) {
             if (item->text() == (*i)->name) {
-                  if(debugMsg)
+                  if(MusEGlobal::debugMsg)
                     printf("found %s\n", (*i)->name.toLatin1().constData());
                   cmt = *i;
                   if (cmodul != -1) {
diff --git a/muse2/muse/mplugins/mitplugin.cpp b/muse2/muse/mplugins/mitplugin.cpp
index dafad993..b60e47e8 100644
--- a/muse2/muse/mplugins/mitplugin.cpp
+++ b/muse2/muse/mplugins/mitplugin.cpp
@@ -37,6 +37,8 @@
 
 MITPluginList mitPlugins;
 
+namespace MusEApp {
+
 //---------------------------------------------------------
 //   startMidiInputPlugin
 //---------------------------------------------------------
@@ -128,24 +130,26 @@ void MusE::hideMidiRhythmGenerator()
 #endif
 
 //---------------------------------------------------------
-//   processMidiInputTransformPlugins
+//   startMidiTransformer
 //---------------------------------------------------------
 
-void processMidiInputTransformPlugins(MEvent& event)
+void MusE::startMidiTransformer()
       {
-      for (iMITPlugin i = mitPlugins.begin(); i != mitPlugins.end(); ++i)
-            (*i)->process(event);
+      if (midiTransformerDialog == 0)
+            midiTransformerDialog = new MidiTransformerDialog;
+      midiTransformerDialog->show();
       }
 
+} // namespace MusEApp
+
 //---------------------------------------------------------
-//   startMidiTransformer
+//   processMidiInputTransformPlugins
 //---------------------------------------------------------
 
-void MusE::startMidiTransformer()
+void processMidiInputTransformPlugins(MEvent& event)
       {
-      if (midiTransformerDialog == 0)
-            midiTransformerDialog = new MidiTransformerDialog;
-      midiTransformerDialog->show();
+      for (iMITPlugin i = mitPlugins.begin(); i != mitPlugins.end(); ++i)
+            (*i)->process(event);
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/mplugins/mittranspose.cpp b/muse2/muse/mplugins/mittranspose.cpp
index 5dd377cd..feefccad 100644
--- a/muse2/muse/mplugins/mittranspose.cpp
+++ b/muse2/muse/mplugins/mittranspose.cpp
@@ -51,7 +51,7 @@ MITPluginTranspose::MITPluginTranspose(QWidget* parent, Qt::WFlags fl)
       connect(onCheckBox, SIGNAL(toggled(bool)), SLOT(onToggled(bool)));
       connect(triggerKeySpinBox, SIGNAL(valueChanged(int)),
          SLOT(triggerKeyChanged(int)));
-      connect(heartBeatTimer, SIGNAL(timeout()), SLOT(noteReceived()));
+      connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), SLOT(noteReceived()));
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/mplugins/mrconfig.cpp b/muse2/muse/mplugins/mrconfig.cpp
index c6780d31..26788389 100644
--- a/muse2/muse/mplugins/mrconfig.cpp
+++ b/muse2/muse/mplugins/mrconfig.cpp
@@ -36,12 +36,12 @@ MRConfig::MRConfig(QWidget* parent, Qt::WFlags fl)
    : QWidget(parent, fl)
       {
       setupUi(this);
-      b1->setChecked(rcEnable);
-      sb1->setValue(rcStopNote);
-      sb2->setValue(rcRecordNote);
-      sb3->setValue(rcGotoLeftMarkNote);
-      sb4->setValue(rcPlayNote);
-      steprec_box->setValue(rcSteprecNote);
+      b1->setChecked(MusEGlobal::rcEnable);
+      sb1->setValue(MusEGlobal::rcStopNote);
+      sb2->setValue(MusEGlobal::rcRecordNote);
+      sb3->setValue(MusEGlobal::rcGotoLeftMarkNote);
+      sb4->setValue(MusEGlobal::rcPlayNote);
+      steprec_box->setValue(MusEGlobal::rcSteprecNote);
 
       connect(b1,  SIGNAL(toggled(bool)), SLOT(setRcEnable(bool)));
       connect(sb1, SIGNAL(valueChanged(int)), SLOT(setRcStopNote(int)));
@@ -63,31 +63,31 @@ void MRConfig::closeEvent(QCloseEvent* ev)
 
 void MRConfig::setRcEnable(bool f)
       {
-      rcEnable = f;
+      MusEGlobal::rcEnable = f;
       }
 
 void MRConfig::setRcStopNote(int val)
       {
-      rcStopNote = val;
+      MusEGlobal::rcStopNote = val;
       }
 
 void MRConfig::setRcRecordNote(int val)
       {
-      rcRecordNote = val;
+      MusEGlobal::rcRecordNote = val;
       }
 
 void MRConfig::setRcGotoLeftMarkNote(int val)
       {
-      rcGotoLeftMarkNote = val;
+      MusEGlobal::rcGotoLeftMarkNote = val;
       }
 
 void MRConfig::setRcPlayNote(int val)
       {
-      rcPlayNote = val;
+      MusEGlobal::rcPlayNote = val;
       }
 
 void MRConfig::setRcSteprecNote(int val)
       {
-      rcSteprecNote = val;
+      MusEGlobal::rcSteprecNote = val;
       }