summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/muse/appearance.cpp2
-rw-r--r--muse2/muse/appearance.h6
-rw-r--r--muse2/muse/conf.cpp6
-rw-r--r--muse2/muse/gconfig.cpp2
-rw-r--r--muse2/muse/gconfig.h8
-rw-r--r--muse2/muse/mixer/amixer.cpp2
-rw-r--r--muse2/muse/mixer/amixer.h9
-rw-r--r--muse2/muse/widgets/musewidgetsplug.cpp2
8 files changed, 23 insertions, 14 deletions
diff --git a/muse2/muse/appearance.cpp b/muse2/muse/appearance.cpp
index 178c6bd8..e9ebf222 100644
--- a/muse2/muse/appearance.cpp
+++ b/muse2/muse/appearance.cpp
@@ -124,7 +124,7 @@ Appearance::Appearance(Arranger* a, QWidget* parent)
setupUi(this);
arr = a;
color = 0;
- config = new GlobalConfigValues;
+ config = new MusEGlobal::GlobalConfigValues;
lastSelectedColorItem = 0;
lastSelectedBgItem = 0;
diff --git a/muse2/muse/appearance.h b/muse2/muse/appearance.h
index d8ec3dc5..ecefeae0 100644
--- a/muse2/muse/appearance.h
+++ b/muse2/muse/appearance.h
@@ -28,10 +28,12 @@
class QColor;
class QDialog;
+namespace MusEGlobal {
+ class GlobalConfigValues;
+}
namespace MusEGui {
class Arranger;
-class GlobalConfigValues;
class MusE;
//---------------------------------------------------------
@@ -45,7 +47,7 @@ class Appearance : public QDialog, public Ui::AppearanceDialogBase {
private:
Arranger* arr;
QColor* color;
- GlobalConfigValues* config;
+ MusEGlobal::GlobalConfigValues* config;
QButtonGroup* aPalette;
QTreeWidgetItem* user_bg;
QTreeWidgetItem* global_bg;
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index c4df1f36..c11adf7b 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -1637,6 +1637,10 @@ void MidiFileConfig::cancelClicked()
close();
}
+} // namespace MusEGui
+
+
+namespace MusEGlobal {
//---------------------------------------------------------
// write
@@ -1722,5 +1726,5 @@ void MixerConfig::read(MusECore::Xml& xml)
}
-} // namespace MusEGui
+} // namespace MusEGlobal
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index 337d7862..bb9f42f4 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -25,7 +25,7 @@
namespace MusEGlobal {
-MusEGui::GlobalConfigValues config = {
+GlobalConfigValues config = {
190, // globalAlphaBlend
{
QColor(0xff, 0xff, 0xff), // palette
diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h
index df6739cf..d9038ea1 100644
--- a/muse2/muse/gconfig.h
+++ b/muse2/muse/gconfig.h
@@ -36,7 +36,7 @@ namespace MusECore {
class Xml;
}
-namespace MusEGui {
+namespace MusEGlobal {
//---------------------------------------------------------
// MixerConfig
@@ -166,10 +166,10 @@ struct GlobalConfigValues {
bool rangeMarkerWithoutMMB;
};
-} // namespace MusEGui
-namespace MusEGlobal {
-extern MusEGui::GlobalConfigValues config;
+
+
+extern GlobalConfigValues config;
} // namespace MusEGlobal
#endif
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 3a947945..731af9a4 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -158,7 +158,7 @@ bool ScrollArea::viewportEvent(QEvent* event)
// inputs | synthis | tracks | groups | master
//---------------------------------------------------------
-AudioMixerApp::AudioMixerApp(QWidget* parent, MixerConfig* c)
+AudioMixerApp::AudioMixerApp(QWidget* parent, MusEGlobal::MixerConfig* c)
: QMainWindow(parent)
{
cfg = c;
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index cf856f22..a52e4264 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -46,6 +46,10 @@ class Meter;
class Track;
}
+namespace MusEGlobal {
+ struct MixerConfig;
+}
+
namespace MusEGui {
class ComboBox;
class DoubleLabel;
@@ -53,7 +57,6 @@ class Knob;
class RouteDialog;
class Slider;
class Strip;
-struct MixerConfig;
typedef std::list<Strip*> StripList;
//---------------------------------------------------------
@@ -82,7 +85,7 @@ class AudioMixerApp : public QMainWindow {
Q_OBJECT
//QString name;
- MixerConfig* cfg;
+ MusEGlobal::MixerConfig* cfg;
StripList stripList;
QScrollArea* view;
QWidget* central;
@@ -141,7 +144,7 @@ class AudioMixerApp : public QMainWindow {
public:
//AudioMixerApp(QWidget* parent);
- AudioMixerApp(QWidget* parent, MixerConfig* c);
+ AudioMixerApp(QWidget* parent, MusEGlobal::MixerConfig* c);
//void write(Xml&, const char* name);
//void write(int level, Xml& xml, const char* name);
void write(int level, MusECore::Xml& xml);
diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp
index 8520a731..4068da57 100644
--- a/muse2/muse/widgets/musewidgetsplug.cpp
+++ b/muse2/muse/widgets/musewidgetsplug.cpp
@@ -53,7 +53,7 @@ static const char* valu[] = {
"C","C#","D","D#","E","F","F#","G","G#","A","A#","H"
};
-GlobalConfigValues config = {
+MusEGlobal::GlobalConfigValues config = {
190, // globalAlphaBlend
{
QColor(0xff, 0xff, 0xff), // palette