diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-08 15:51:58 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-08 15:51:58 +0000 |
| commit | 9cd7615aaa5bc2818ae5f9425173f08673bbc194 (patch) | |
| tree | f3d9820a84fd43b4667c0222ee3ac0704c3e6eee /muse2/muse/songfile.cpp | |
| parent | 9e6dc222b92bbfba58756d3be47890dd885b8f71 (diff) | |
| parent | 80d1f99cbad08ee6b0d7076f8df80ae71857c9f3 (diff) | |
merged with trunk again
drum ordering is now stored in the songfile
track reading bugfix
Diffstat (limited to 'muse2/muse/songfile.cpp')
| -rw-r--r-- | muse2/muse/songfile.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp index 9efc75bd..3096312e 100644 --- a/muse2/muse/songfile.cpp +++ b/muse2/muse/songfile.cpp @@ -1121,6 +1121,8 @@ void Song::read(Xml& xml, bool isTemplate) } else if (tag == "drummap") readDrumMap(xml, false); + else if (tag == "drum_ordering") + MusEGlobal::global_drum_ordering.read(xml); else xml.unknown("Song"); break; @@ -1213,6 +1215,7 @@ void Song::write(int level, Xml& xml) const _markerList->write(level, xml); writeDrumMap(level, xml, false); + MusEGlobal::global_drum_ordering.write(level, xml); xml.tag(level, "/song"); // Restore backup of the clone list, to retain any 'copy' items, |