move mixer subdir

23 files changed, 24 insertions, 11 deletions

diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt
index 1bda0e5c..000a8787 100644
--- a/muse/muse/CMakeLists.txt
+++ b/muse/muse/CMakeLists.txt
@@ -32,7 +32,6 @@ subdirs (
       instruments
       marker
       liste
-      mixer
       arranger
       waveedit
       )
@@ -48,6 +47,7 @@ QT4_WRAP_UI  (muse_ui_headers
       projectdialog.ui
       templatedialog.ui
       importmidi.ui
+      routedialog.ui
       )
 
 QT4_WRAP_CPP ( muse_moc_headers
@@ -78,6 +78,13 @@ QT4_WRAP_CPP ( muse_moc_headers
       importmidi.h
       midiinport.h
       midioutport.h
+      astrip.h
+      midirack.h
+      mixer.h
+      mstrip.h
+      rack.h
+      routedialog.h
+      strip.h
       )
 
 QT4_ADD_RESOURCES (muse_qrc_files muse.qrc)
@@ -159,6 +166,13 @@ add_executable ( muse
       exportmidi.cpp
       revision.cpp
       jack.cpp dummyaudio.cpp
+      astrip.cpp
+      midirack.cpp
+      mixer.cpp
+      mstrip.cpp
+      rack.cpp
+      routedialog.cpp
+      strip.cpp
       )
 
 set_target_properties( muse
@@ -173,7 +187,6 @@ target_link_libraries(muse
       liste
       synti
       arranger
-      mixer
       waveedit
       widgets
       al
diff --git a/muse/muse/arranger/arranger.cpp b/muse/muse/arranger/arranger.cpp
index 51e0324c..7b4be381 100644
--- a/muse/muse/arranger/arranger.cpp
+++ b/muse/muse/arranger/arranger.cpp
@@ -29,8 +29,8 @@
 #include "canvas.h"
 #include "widgets/utils.h"
 #include "widgets/splitter.h"
-#include "mixer/astrip.h"
-#include "mixer/mstrip.h"
+#include "astrip.h"
+#include "mstrip.h"
 #include "audio.h"
 #include "shortcuts.h"
 #include "trackinfo.h"
diff --git a/muse/muse/mixer/astrip.cpp b/muse/muse/astrip.cpp
index 8d6cdd09..8d6cdd09 100644
--- a/muse/muse/mixer/astrip.cpp
+++ b/muse/muse/astrip.cpp
diff --git a/muse/muse/mixer/astrip.h b/muse/muse/astrip.h
index f0806fda..f0806fda 100644
--- a/muse/muse/mixer/astrip.h
+++ b/muse/muse/astrip.h
diff --git a/muse/muse/conf.cpp b/muse/muse/conf.cpp
index 5dfbc8b2..162f6f9b 100644
--- a/muse/muse/conf.cpp
+++ b/muse/muse/conf.cpp
@@ -28,7 +28,7 @@
 #include "al/xml.h"
 #include "widgets/midisync.h"
 #include "sync.h"
-#include "mixer/mixer.h"
+#include "mixer.h"
 #include "globals.h"
 #include "midirc.h"
 #include "awl/tcanvas.h"
diff --git a/muse/muse/importmidi.cpp b/muse/muse/importmidi.cpp
index 8f27e2d7..c995ed67 100644
--- a/muse/muse/importmidi.cpp
+++ b/muse/muse/importmidi.cpp
@@ -35,7 +35,7 @@
 #include "projectdialog.h"
 #include "templatedialog.h"
 #include "audio.h"
-#include "mixer/mixer.h"
+#include "mixer.h"
 #include "arranger/arranger.h"
 #include "midictrl.h"
 #include "midiinport.h"
diff --git a/muse/muse/mixer/midirack.cpp b/muse/muse/midirack.cpp
index 0b054729..0b054729 100644
--- a/muse/muse/mixer/midirack.cpp
+++ b/muse/muse/midirack.cpp
diff --git a/muse/muse/mixer/midirack.h b/muse/muse/midirack.h
index 7f83ca42..7f83ca42 100644
--- a/muse/muse/mixer/midirack.h
+++ b/muse/muse/midirack.h
diff --git a/muse/muse/mixer/mixer.cpp b/muse/muse/mixer.cpp
index b3e5ce06..b3e5ce06 100644
--- a/muse/muse/mixer/mixer.cpp
+++ b/muse/muse/mixer.cpp
diff --git a/muse/muse/mixer/mixer.h b/muse/muse/mixer.h
index 62c526a6..62c526a6 100644
--- a/muse/muse/mixer/mixer.h
+++ b/muse/muse/mixer.h
diff --git a/muse/muse/mixer/mstrip.cpp b/muse/muse/mstrip.cpp
index d4c48f5e..d4c48f5e 100644
--- a/muse/muse/mixer/mstrip.cpp
+++ b/muse/muse/mstrip.cpp
diff --git a/muse/muse/mixer/mstrip.h b/muse/muse/mstrip.h
index 4c3269de..4c3269de 100644
--- a/muse/muse/mixer/mstrip.h
+++ b/muse/muse/mstrip.h
diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp
index c6dbc103..c025491e 100644
--- a/muse/muse/muse.cpp
+++ b/muse/muse/muse.cpp
@@ -33,7 +33,7 @@
 #include "liste/listedit.h"
 #include "master/masteredit.h"
 #include "midiedit/drumedit.h"
-#include "mixer/mixer.h"
+#include "mixer.h"
 #include "audiodev.h"
 #include "waveedit/waveedit.h"
 #include "icons.h"
@@ -63,7 +63,7 @@
 #include "midiedit/miditracker.h"
 #include "projectpropsdialog.h"
 #include "liste/listedit.h"
-#include "mixer/strip.h"
+#include "strip.h"
 
 extern void initMidiInstruments();
 
diff --git a/muse/muse/preferences.cpp b/muse/muse/preferences.cpp
index ef3d23b1..6b7580d5 100644
--- a/muse/muse/preferences.cpp
+++ b/muse/muse/preferences.cpp
@@ -32,7 +32,7 @@
 #include "gconfig.h"
 
 #include "audio.h"
-#include "mixer/mixer.h"
+#include "mixer.h"
 #include "midirc.h"
 #include "instruments/minstrument.h"
 #include "midiedit/pianoroll.h"
diff --git a/muse/muse/mixer/rack.cpp b/muse/muse/rack.cpp
index dbd76804..dbd76804 100644
--- a/muse/muse/mixer/rack.cpp
+++ b/muse/muse/rack.cpp
diff --git a/muse/muse/mixer/rack.h b/muse/muse/rack.h
index c468d8b9..c468d8b9 100644
--- a/muse/muse/mixer/rack.h
+++ b/muse/muse/rack.h
diff --git a/muse/muse/mixer/routedialog.cpp b/muse/muse/routedialog.cpp
index a2f3b584..a2f3b584 100644
--- a/muse/muse/mixer/routedialog.cpp
+++ b/muse/muse/routedialog.cpp
diff --git a/muse/muse/mixer/routedialog.h b/muse/muse/routedialog.h
index 2bcbf471..2bcbf471 100644
--- a/muse/muse/mixer/routedialog.h
+++ b/muse/muse/routedialog.h
diff --git a/muse/muse/mixer/routedialog.ui b/muse/muse/routedialog.ui
index be34c451..be34c451 100644
--- a/muse/muse/mixer/routedialog.ui
+++ b/muse/muse/routedialog.ui
diff --git a/muse/muse/seqmsg.cpp b/muse/muse/seqmsg.cpp
index 4df58e89..adf2a66e 100644
--- a/muse/muse/seqmsg.cpp
+++ b/muse/muse/seqmsg.cpp
@@ -21,7 +21,7 @@
 #include "song.h"
 #include "instruments/minstrument.h"
 #include "muse.h"
-#include "mixer/mixer.h"
+#include "mixer.h"
 #include "al/tempo.h"
 #include "al/sig.h"
 #include "audio.h"
diff --git a/muse/muse/song.cpp b/muse/muse/song.cpp
index dd78cc5c..79e1f563 100644
--- a/muse/muse/song.cpp
+++ b/muse/muse/song.cpp
@@ -26,7 +26,7 @@
 #include "event.h"
 #include "midiedit/drummap.h"
 #include "audio.h"
-#include "mixer/mixer.h"
+#include "mixer.h"
 #include "audiodev.h"
 #include "gconfig.h"
 #include "al/marker.h"
diff --git a/muse/muse/mixer/strip.cpp b/muse/muse/strip.cpp
index 38519878..38519878 100644
--- a/muse/muse/mixer/strip.cpp
+++ b/muse/muse/strip.cpp
diff --git a/muse/muse/mixer/strip.h b/muse/muse/strip.h
index f9bc06ea..f9bc06ea 100644
--- a/muse/muse/mixer/strip.h
+++ b/muse/muse/strip.h