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...

3 files changed, 21 insertions, 2 deletions

diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 18fe926f..082b9461 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -183,6 +183,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c)
       
       showMidiTracksId = new QAction(tr("Show Midi Tracks"), actionItems);
       showDrumTracksId = new QAction(tr("Show Drum Tracks"), actionItems);
+      showNewDrumTracksId = new QAction(tr("Show New Style Drum Tracks"), actionItems);
       showWaveTracksId = new QAction(tr("Show Wave Tracks"), actionItems);
 
       QAction *separator = new QAction(this);
@@ -197,6 +198,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c)
 
       showMidiTracksId->setCheckable(true);
       showDrumTracksId->setCheckable(true);
+      showNewDrumTracksId->setCheckable(true);
       showWaveTracksId->setCheckable(true);
       showInputTracksId->setCheckable(true);
       showOutputTracksId->setCheckable(true);
@@ -208,6 +210,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c)
       //connect(actionItems, SIGNAL(selected(QAction*)), this, SLOT(showTracksChanged(QAction*)));
       connect(showMidiTracksId, SIGNAL(triggered(bool)), SLOT(showMidiTracksChanged(bool)));
       connect(showDrumTracksId, SIGNAL(triggered(bool)), SLOT(showDrumTracksChanged(bool)));      
+      connect(showNewDrumTracksId, SIGNAL(triggered(bool)), SLOT(showNewDrumTracksChanged(bool)));      
       connect(showWaveTracksId, SIGNAL(triggered(bool)), SLOT(showWaveTracksChanged(bool)));      
       connect(showInputTracksId, SIGNAL(triggered(bool)), SLOT(showInputTracksChanged(bool)));      
       connect(showOutputTracksId, SIGNAL(triggered(bool)), SLOT(showOutputTracksChanged(bool)));      
@@ -349,6 +352,7 @@ void AudioMixerApp::updateMixer(UpdateAction action)
       
       showMidiTracksId->setChecked(cfg->showMidiTracks);
       showDrumTracksId->setChecked(cfg->showDrumTracks);
+      showNewDrumTracksId->setChecked(cfg->showNewDrumTracks);
       showInputTracksId->setChecked(cfg->showInputTracks);
       showOutputTracksId->setChecked(cfg->showOutputTracks);
       showWaveTracksId->setChecked(cfg->showWaveTracks);
@@ -428,7 +432,7 @@ void AudioMixerApp::updateMixer(UpdateAction action)
             for (iMidiTrack i = mtl->begin(); i != mtl->end(); ++i) 
             {
               MidiTrack* mt = *i;
-              if((mt->type() == Track::MIDI && cfg->showMidiTracks) || (mt->type() == Track::DRUM && cfg->showDrumTracks)) 
+              if((mt->type() == Track::MIDI && cfg->showMidiTracks) || (mt->type() == Track::DRUM && cfg->showDrumTracks) || (mt->type() == Track::NEW_DRUM && cfg->showNewDrumTracks)) 
                 addStrip(*i, idx++);
             }
       
@@ -485,7 +489,7 @@ void AudioMixerApp::updateMixer(UpdateAction action)
       for (iMidiTrack i = mtl->begin(); i != mtl->end(); ++i) 
       {
         MidiTrack* mt = *i;
-        if((mt->type() == Track::MIDI && cfg->showMidiTracks) || (mt->type() == Track::DRUM && cfg->showDrumTracks)) 
+        if((mt->type() == Track::MIDI && cfg->showMidiTracks) || (mt->type() == Track::DRUM && cfg->showDrumTracks) || (mt->type() == Track::NEW_DRUM && cfg->showNewDrumTracks)) 
           addStrip(*i, idx++);
       }
 
@@ -627,6 +631,8 @@ void AudioMixerApp::showTracksChanged(QAction* id)
             cfg->showMidiTracks = val;
       else if (id == showDrumTracksId)
             cfg->showDrumTracks = val;
+      else if (id == showNewDrumTracksId)
+            cfg->showNewDrumTracks = val;
       else if (id == showInputTracksId)
             cfg->showInputTracks = val;
       else if (id == showOutputTracksId)
@@ -655,6 +661,12 @@ void AudioMixerApp::showDrumTracksChanged(bool v)
       updateMixer(UPDATE_ALL);
 }
 
+void AudioMixerApp::showNewDrumTracksChanged(bool v)
+{
+      cfg->showNewDrumTracks = v;
+      updateMixer(UPDATE_ALL);
+}
+
 void AudioMixerApp::showWaveTracksChanged(bool v)
 {
       cfg->showWaveTracks = v;
@@ -710,6 +722,7 @@ void AudioMixerApp::write(int level, Xml& xml)
       
       xml.intTag(level, "showMidiTracks",   cfg->showMidiTracks);
       xml.intTag(level, "showDrumTracks",   cfg->showDrumTracks);
+      xml.intTag(level, "showNewDrumTracks",   cfg->showNewDrumTracks);
       xml.intTag(level, "showInputTracks",  cfg->showInputTracks);
       xml.intTag(level, "showOutputTracks", cfg->showOutputTracks);
       xml.intTag(level, "showWaveTracks",   cfg->showWaveTracks);
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index 5be12659..60a77f12 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -101,6 +101,7 @@ class AudioMixerApp : public QMainWindow {
 
       QAction* showMidiTracksId;
       QAction* showDrumTracksId;
+      QAction* showNewDrumTracksId;
       QAction* showInputTracksId;
       QAction* showOutputTracksId;
       QAction* showWaveTracksId;
@@ -134,6 +135,7 @@ class AudioMixerApp : public QMainWindow {
       //void showTracksChanged(QAction*);
       void showMidiTracksChanged(bool);
       void showDrumTracksChanged(bool);
+      void showNewDrumTracksChanged(bool);
       void showWaveTracksChanged(bool);
       void showInputTracksChanged(bool);
       void showOutputTracksChanged(bool);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index 59149222..67594e3a 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -150,6 +150,10 @@ void Strip::setLabelText()
                   //c = QColor(0, 160, 255); // Med blue
                   c = MusEConfig::config.drumTrackLabelBg;
                   break;
+            case Track::NEW_DRUM:
+                  //c = QColor(0, 160, 255); // Med blue
+                  c = MusEConfig::config.newDrumTrackLabelBg;
+                  break;
             default:
                   return;      
             }