diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-07 14:53:22 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-07 14:53:22 +0000 |
| commit | 3e6f82d7b9b29e8df7d63658540b762203b820f6 (patch) | |
| tree | 3e1a71a2bda678b1574ab88c59195b158c0a64ca /muse2/muse/conf.cpp | |
| parent | f60ddccd6d328a5cebc4d524246e33b399a8dfdd (diff) | |
added new style drum tracks
atm, they aren't different from midi tracks except that they launch
a drum editor by default
added markers to help me finding the places to change
TODO: instrument muting, in-note-mapping etc...
Diffstat (limited to 'muse2/muse/conf.cpp')
| -rw-r--r-- | muse2/muse/conf.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp index 35b96591..e1d141e7 100644 --- a/muse2/muse/conf.cpp +++ b/muse2/muse/conf.cpp @@ -786,6 +786,8 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig MusEConfig::config.midiTrackLabelBg = readColor(xml); else if (tag == "drumTrackLabelBg") MusEConfig::config.drumTrackLabelBg = readColor(xml); + else if (tag == "newDrumTrackLabelBg") + MusEConfig::config.newDrumTrackLabelBg = readColor(xml); else if (tag == "waveTrackLabelBg") MusEConfig::config.waveTrackLabelBg = readColor(xml); else if (tag == "outputTrackLabelBg") @@ -805,6 +807,8 @@ void readConfiguration(Xml& xml, bool readOnlySequencer, bool doReadGlobalConfig MusEConfig::config.ctrlGraphFg = readColor(xml); else if (tag == "drumTrackBg") MusEConfig::config.drumTrackBg = readColor(xml); + else if (tag == "newDrumTrackBg") + MusEConfig::config.newDrumTrackBg = readColor(xml); else if (tag == "waveTrackBg") MusEConfig::config.waveTrackBg = readColor(xml); else if (tag == "outputTrackBg") @@ -1317,6 +1321,7 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const xml.colorTag(level, "mixerBg", MusEConfig::config.mixerBg); xml.colorTag(level, "midiTrackLabelBg", MusEConfig::config.midiTrackLabelBg); xml.colorTag(level, "drumTrackLabelBg", MusEConfig::config.drumTrackLabelBg); + xml.colorTag(level, "newDrumTrackLabelBg", MusEConfig::config.newDrumTrackLabelBg); xml.colorTag(level, "waveTrackLabelBg", MusEConfig::config.waveTrackLabelBg); xml.colorTag(level, "outputTrackLabelBg", MusEConfig::config.outputTrackLabelBg); xml.colorTag(level, "inputTrackLabelBg", MusEConfig::config.inputTrackLabelBg); @@ -1326,7 +1331,7 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const xml.colorTag(level, "midiTrackBg", MusEConfig::config.midiTrackBg); xml.colorTag(level, "ctrlGraphFg", MusEConfig::config.ctrlGraphFg); - xml.colorTag(level, "drumTrackBg", MusEConfig::config.drumTrackBg); + xml.colorTag(level, "newDrumTrackBg", MusEConfig::config.newDrumTrackBg); xml.colorTag(level, "waveTrackBg", MusEConfig::config.waveTrackBg); xml.colorTag(level, "outputTrackBg", MusEConfig::config.outputTrackBg); xml.colorTag(level, "inputTrackBg", MusEConfig::config.inputTrackBg); @@ -1655,6 +1660,7 @@ void MixerConfig::write(int level, Xml& xml) xml.intTag(level, "showMidiTracks", showMidiTracks); xml.intTag(level, "showDrumTracks", showDrumTracks); + xml.intTag(level, "showNewDrumTracks", showNewDrumTracks); xml.intTag(level, "showInputTracks", showInputTracks); xml.intTag(level, "showOutputTracks", showOutputTracks); xml.intTag(level, "showWaveTracks", showWaveTracks); @@ -1692,6 +1698,8 @@ void MixerConfig::read(Xml& xml) showMidiTracks = xml.parseInt(); else if (tag == "showDrumTracks") showDrumTracks = xml.parseInt(); + else if (tag == "showNewDrumTracks") + showNewDrumTracks = xml.parseInt(); else if (tag == "showInputTracks") showInputTracks = xml.parseInt(); else if (tag == "showOutputTracks") |