summaryrefslogtreecommitdiff
path: root/muse2/muse/mixer/amixer.h
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/mixer/amixer.h')
-rw-r--r--muse2/muse/mixer/amixer.h13
1 files changed, 10 insertions, 3 deletions
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