diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
commit | f16b2037025918e32c5fd90527f76e1102e5ecb9 (patch) | |
tree | 0da3b7a29d13b5b826b291ccb2f2676d2e227b40 /muse2/muse/song.h | |
parent | 42039e7f7f215f6008829d8c6be591c998f1228c (diff) |
(hopefully) final huge namespace update.
Diffstat (limited to 'muse2/muse/song.h')
-rw-r--r-- | muse2/muse/song.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/muse2/muse/song.h b/muse2/muse/song.h index 79e5521f..7bbd831d 100644 --- a/muse2/muse/song.h +++ b/muse2/muse/song.h @@ -42,15 +42,15 @@ class QAction; class QFont; class QMenu; +namespace MusECore { + class SynthI; struct MidiMsg; -struct AudioMsg; class Event; class Xml; class Sequencer; class Track; class Part; -class MidiPart; class PartList; class MPEventList; class EventList; @@ -58,7 +58,11 @@ class MarkerList; class Marker; class SNode; +struct AudioMsg; + +class MidiPart; class MidiPort; + class MidiDevice; class AudioPort; class AudioDevice; @@ -424,11 +428,15 @@ class Song : public QObject { void markerChanged(int); void midiPortsChanged(); void midiNote(int pitch, int velo); - void controllerChanged(Track* t); - void newPartsCreated(const std::map< Part*, std::set<Part*> >&); + void controllerChanged(MusECore::Track* t); + void newPartsCreated(const std::map< MusECore::Part*, std::set<MusECore::Part*> >&); }; -extern Song* song; +} // namespace MusECore + +namespace MusEGlobal { +extern MusECore::Song* song; +} #endif |