summaryrefslogtreecommitdiff
path: root/muse2/muse/arranger/arranger.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-09-27 16:08:57 +0000
committerFlorian Jung <flo@windfisch.org>2011-09-27 16:08:57 +0000
commite9e38901f1b0c8b0d4c11f6de37abf7ff6c7234f (patch)
tree6db56ee33fda6adce28afc456c4fd84b56180453 /muse2/muse/arranger/arranger.h
parent5c2eaaf143f517e1a4d52e243a761e479aeb3e5b (diff)
parentd52fac00567bb85944188f3c946b86b2a420819c (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/arranger/arranger.h')
-rw-r--r--muse2/muse/arranger/arranger.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h
index 1e3943be..f65c69a6 100644
--- a/muse2/muse/arranger/arranger.h
+++ b/muse2/muse/arranger/arranger.h
@@ -39,12 +39,13 @@ class QWheelEvent;
class QKeyEvent;
//class QStackedWidget;
-class TList;
class Track;
class Xml;
-class TLLayout;
class WidgetStack;
+
+namespace MusEMixer {
class AudioStrip;
+}
namespace MusEWidget {
class Header;
@@ -57,7 +58,10 @@ class Splitter;
class SpinBox;
}
+namespace MusEArranger {
class ArrangerView;
+class TList;
+class TLLayout;
//---------------------------------------------------------
// WidgetStack
@@ -101,7 +105,7 @@ class Arranger : public QWidget {
QScrollBar* infoScroll;
//MidiTrackInfoBase* midiTrackInfo;
MusEWidget::MidiTrackInfo* midiTrackInfo;
- AudioStrip* waveTrackInfo;
+ MusEMixer::AudioStrip* waveTrackInfo;
QWidget* noTrackInfo;
TLLayout* tgrid;
@@ -193,5 +197,7 @@ class Arranger : public QWidget {
ArrangerView* parentWin;
};
+} // namespace MusEArranger
+
#endif