New namespaces and change in default colors. See ChangeLog.

14 files changed, 60 insertions, 11 deletions

diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index e30524ae..18fe926f 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -51,6 +51,7 @@
 //typedef std::list<Strip*> StripList;
 //static StripList stripList;
 
+namespace MusEMixer {
 
 /* 
 Nov 16, 2010: After making the strips variable width, we need a way to
@@ -596,7 +597,7 @@ void AudioMixerApp::toggleRouteDialog()
 void AudioMixerApp::showRouteDialog(bool on)
       {
       if (on && routingDialog == 0) {
-            routingDialog = new RouteDialog(this);
+            routingDialog = new MusEDialog::RouteDialog(this);
             connect(routingDialog, SIGNAL(closed()), SLOT(routingDialogClosed()));
             }
       if (routingDialog)
@@ -721,3 +722,4 @@ void AudioMixerApp::write(int level, Xml& xml)
       xml.etag(level, "Mixer");
       }
 
+} // namespace MusEMixer
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index 41f1e5e1..5be12659 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -45,15 +45,20 @@ class Slider;
 class Knob;
 class DoubleLabel;
 class ComboBox;
-class RouteDialog;
-class Strip;
 
 namespace MusEConfig {
 struct MixerConfig;
 }
 
+namespace MusEDialog {
+class RouteDialog;
+}
+
 #define EFX_HEIGHT     16
 
+namespace MusEMixer {
+
+class Strip;
 typedef std::list<Strip*> StripList;
 
 //---------------------------------------------------------
@@ -90,7 +95,7 @@ class AudioMixerApp : public QMainWindow {
       //Strip* master;
       QHBoxLayout* layout;
       QMenu* menuView;
-      RouteDialog* routingDialog;
+      MusEDialog::RouteDialog* routingDialog;
       QAction* routingId;
       int oldAuxsSize;
 
@@ -148,5 +153,7 @@ class AudioMixerApp : public QMainWindow {
       void clear();
       };
 
+} // namespace MusEMixer
+
 #endif
 
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 1aa9ae2b..156017e8 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -67,6 +67,8 @@
 //#include "popupmenu.h"
 #include "routepopup.h"
 
+namespace MusEMixer {
+
 /*
 //---------------------------------------------------------
 //   minimumSizeHint
@@ -229,7 +231,7 @@ void AudioStrip::songChanged(int val)
             //QLinearGradient gradient(autoType->geometry().topLeft(), autoType->geometry().bottomLeft());
             if(track->automationType() == AUTO_TOUCH || track->automationType() == AUTO_WRITE)
                   {
-                  palette.setColor(QPalette::Button, QColor(Qt::red));
+                  palette.setColor(QPalette::Button, QColor(215, 76, 39)); // red
                   //QColor c(Qt::red);
                   //gradient.setColorAt(0, c);
                   //gradient.setColorAt(1, c.darker());
@@ -238,7 +240,7 @@ void AudioStrip::songChanged(int val)
                   }
             else if(track->automationType() == AUTO_READ)
                   {
-                  palette.setColor(QPalette::Button, QColor(Qt::green));
+                  palette.setColor(QPalette::Button, QColor(100, 172, 49)); // green
                   //QColor c(Qt::green);
                   //gradient.setColorAt(0, c);
                   //gradient.setColorAt(1, c.darker());
@@ -1041,3 +1043,4 @@ void AudioStrip::oRoutePressed()
       pup->exec(QCursor::pos(), track, true);
 }
 
+} // namespace MusEMixer
diff --git a/muse2/muse/mixer/astrip.h b/muse2/muse/mixer/astrip.h
index fc25bb9b..72e88cca 100644
--- a/muse2/muse/mixer/astrip.h
+++ b/muse2/muse/mixer/astrip.h
@@ -43,8 +43,11 @@ class QToolButton;
 //class PopupMenu;
 class QButton;
 class AudioTrack;
-class EffectRack;
 
+namespace MusEMixer {
+
+class EffectRack;
+  
 //---------------------------------------------------------
 //   AudioStrip
 //---------------------------------------------------------
@@ -113,5 +116,7 @@ class AudioStrip : public Strip {
       //virtual QSize sizeHint () const;
       };
 
+} // namespace MusEMixer
+
 #endif
 
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index d8e09adb..c6832e6b 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -61,6 +61,8 @@
 //#include "popupmenu.h"
 #include "routepopup.h"
 
+namespace MusEMixer {
+
 enum { KNOB_PAN, KNOB_VAR_SEND, KNOB_REV_SEND, KNOB_CHO_SEND };
 
 //---------------------------------------------------------
@@ -218,8 +220,8 @@ MidiStrip::MidiStrip(QWidget* parent, MidiTrack* t)
       
       sliderGrid = new QGridLayout(); 
       sliderGrid->setRowStretch(0, 100);
-      sliderGrid->addWidget(slider, 0, 0, Qt::AlignRight);
-      sliderGrid->addWidget(meter[0], 0, 1, Qt::AlignLeft);
+      sliderGrid->addWidget(slider, 0, 0, Qt::AlignHCenter);
+      sliderGrid->addWidget(meter[0], 0, 1, Qt::AlignHCenter);
       grid->addLayout(sliderGrid, _curGridRow++, 0, 1, 2); 
 
       sl = new MusEWidget::DoubleLabel(0.0, -98.0, 0.0, this);
@@ -1028,4 +1030,4 @@ void MidiStrip::oRoutePressed()
   pup->exec(QCursor::pos(), track, true);
 }
 
-
+} // namespace MusEMixer
diff --git a/muse2/muse/mixer/mstrip.h b/muse2/muse/mixer/mstrip.h
index 2f0a133d..d8e947f9 100644
--- a/muse2/muse/mixer/mstrip.h
+++ b/muse2/muse/mixer/mstrip.h
@@ -41,6 +41,7 @@ class TransparentToolButton;
 
 class MidiTrack;
 
+namespace MusEMixer {
 
 //---------------------------------------------------------
 //   MidiStrip
@@ -94,6 +95,7 @@ class MidiStrip : public Strip {
       MidiStrip(QWidget* parent, MidiTrack*);
       };
 
+} // namespace MusEMixer
 
 #endif
 
diff --git a/muse2/muse/mixer/panknob.cpp b/muse2/muse/mixer/panknob.cpp
index f645ddf7..9a12d58f 100644
--- a/muse2/muse/mixer/panknob.cpp
+++ b/muse2/muse/mixer/panknob.cpp
@@ -26,6 +26,8 @@
 #include "panknob.h"
 #include "track.h"
 
+namespace MusEWidget {
+
 //---------------------------------------------------------
 //   PanKnob
 //---------------------------------------------------------
@@ -49,4 +51,4 @@ void PanKnob::valueChanged(double val)
       song->controllerChange(src);
       }
 
-
+} // namespace MusEWidget
diff --git a/muse2/muse/mixer/panknob.h b/muse2/muse/mixer/panknob.h
index 5fcb2171..7f0d3232 100644
--- a/muse2/muse/mixer/panknob.h
+++ b/muse2/muse/mixer/panknob.h
@@ -28,6 +28,8 @@
 
 class AudioTrack;
 
+namespace MusEWidget {
+
 //---------------------------------------------------------
 //   PanKnob
 //---------------------------------------------------------
@@ -43,5 +45,7 @@ class PanKnob : public Knob {
       PanKnob(QWidget* parent, AudioTrack*);
       };
 
+} // namespace MusEWidget
+
 #endif
 
diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp
index fdd80e60..7daf142d 100644
--- a/muse2/muse/mixer/rack.cpp
+++ b/muse2/muse/mixer/rack.cpp
@@ -46,6 +46,8 @@
 #include "plugin.h"
 #include "filedialog.h"
 
+namespace MusEMixer {
+
 //---------------------------------------------------------
 //   class EffectRackDelegate
 //---------------------------------------------------------
@@ -700,3 +702,4 @@ void EffectRack::initPlugin(Xml xml, int idx)
             }
       }                        
 
+} // namespace MusEMixer
diff --git a/muse2/muse/mixer/rack.h b/muse2/muse/mixer/rack.h
index 65d112e9..2ea053bf 100644
--- a/muse2/muse/mixer/rack.h
+++ b/muse2/muse/mixer/rack.h
@@ -34,6 +34,8 @@ class QMouseEvent;
 class AudioTrack;
 class Xml;
 
+namespace MusEMixer {
+
 //---------------------------------------------------------
 //   EffectRack
 //---------------------------------------------------------
@@ -80,5 +82,7 @@ class EffectRack : public QListWidget {
 
       };
 
+} // namespace MusEMixer
+
 #endif
 
diff --git a/muse2/muse/mixer/routedialog.cpp b/muse2/muse/mixer/routedialog.cpp
index 53b8d48b..a9441343 100644
--- a/muse2/muse/mixer/routedialog.cpp
+++ b/muse2/muse/mixer/routedialog.cpp
@@ -32,6 +32,8 @@
 #include "audio.h"
 #include "driver/jackaudio.h"
 
+namespace MusEDialog {
+
 //---------------------------------------------------------
 //   RouteDialog
 //---------------------------------------------------------
@@ -199,3 +201,5 @@ void RouteDialog::closeEvent(QCloseEvent* e)
       emit closed();
       e->accept();
       }
+
+} // namespace MusEDialog
diff --git a/muse2/muse/mixer/routedialog.h b/muse2/muse/mixer/routedialog.h
index d5326ab3..de5dfbc3 100644
--- a/muse2/muse/mixer/routedialog.h
+++ b/muse2/muse/mixer/routedialog.h
@@ -29,6 +29,8 @@
 class QCloseEvent;
 class QDialog;
 
+namespace MusEDialog {
+
 //---------------------------------------------------------
 //   RouteDialog
 //---------------------------------------------------------
@@ -55,5 +57,7 @@ class RouteDialog : public QDialog, public Ui::RouteDialogBase {
       };
 
 
+} // namespace MusEDialog
+
 #endif
 
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index 750f1623..e9f92e9b 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -39,6 +39,8 @@
 #include "meter.h"
 #include "utils.h"
 
+namespace MusEMixer {
+
 //---------------------------------------------------------
 //   setRecordFlag
 //---------------------------------------------------------
@@ -278,3 +280,4 @@ void Strip::setAutomationType(int t)
       song->update(SC_AUTOMATION);
       }
 
+} // namespace MusEMixer
diff --git a/muse2/muse/mixer/strip.h b/muse2/muse/mixer/strip.h
index 602e6e07..ea4d2693 100644
--- a/muse2/muse/mixer/strip.h
+++ b/muse2/muse/mixer/strip.h
@@ -44,6 +44,8 @@ class ComboBox;
 class Meter;
 }
 
+namespace MusEMixer {
+
 static const int STRIP_WIDTH = 65;
 
 //---------------------------------------------------------
@@ -92,5 +94,7 @@ class Strip : public QFrame {
       void setLabelFont();
       };
 
+} // namespace MusEMixer
+
 #endif