summaryrefslogtreecommitdiff
path: root/muse2/muse/gconfig.h
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/gconfig.h')
-rw-r--r--muse2/muse/gconfig.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h
index 95b88170..f611687f 100644
--- a/muse2/muse/gconfig.h
+++ b/muse2/muse/gconfig.h
@@ -34,6 +34,15 @@
namespace MusECore {
class Xml;
+
+enum newDrumRecordCondition_t
+{
+ REC_ALL = 0,
+ DONT_REC_HIDDEN = 1,
+ DONT_REC_MUTED = 2,
+ DONT_REC_MUTED_OR_HIDDEN = 3
+};
+
}
namespace MusEGlobal {
@@ -47,6 +56,7 @@ struct MixerConfig {
QRect geometry;
bool showMidiTracks;
bool showDrumTracks;
+ bool showNewDrumTracks;
bool showInputTracks;
bool showOutputTracks;
bool showWaveTracks;
@@ -83,6 +93,7 @@ struct GlobalConfigValues {
QColor midiTrackLabelBg;
QColor drumTrackLabelBg;
+ QColor newDrumTrackLabelBg;
QColor waveTrackLabelBg;
QColor outputTrackLabelBg;
QColor inputTrackLabelBg;
@@ -92,6 +103,7 @@ struct GlobalConfigValues {
QColor midiTrackBg;
QColor drumTrackBg;
+ QColor newDrumTrackBg;
QColor waveTrackBg;
QColor outputTrackBg;
QColor inputTrackBg;
@@ -118,6 +130,7 @@ struct GlobalConfigValues {
bool exp2ByteTimeSigs; // Export 2 byte time sigs instead of 4 bytes
bool expOptimNoteOffs; // Save space by replacing note offs with note on velocity 0
bool importMidiSplitParts; // Split imported tracks into multiple parts.
+ bool importMidiNewStyleDrum; // Use new style drum tracks
int startMode; // 0 - start with last song
// 1 - start with default template
@@ -164,9 +177,9 @@ struct GlobalConfigValues {
bool popupsDefaultStayOpen;
bool leftMouseButtonCanDecrease;
bool rangeMarkerWithoutMMB;
+ MusECore::newDrumRecordCondition_t newDrumRecordCondition;
bool addHiddenTracks;
bool unhideTracks;
-
};