summaryrefslogtreecommitdiff
path: root/muse2/muse/ctrl
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-07 14:53:22 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-07 14:53:22 +0000
commit3e6f82d7b9b29e8df7d63658540b762203b820f6 (patch)
tree3e1a71a2bda678b1574ab88c59195b158c0a64ca /muse2/muse/ctrl
parentf60ddccd6d328a5cebc4d524246e33b399a8dfdd (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/ctrl')
-rw-r--r--muse2/muse/ctrl/ctrlcanvas.cpp6
-rw-r--r--muse2/muse/ctrl/ctrlpanel.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/muse2/muse/ctrl/ctrlcanvas.cpp b/muse2/muse/ctrl/ctrlcanvas.cpp
index 7c77a836..fb4816f9 100644
--- a/muse2/muse/ctrl/ctrlcanvas.cpp
+++ b/muse2/muse/ctrl/ctrlcanvas.cpp
@@ -535,10 +535,10 @@ void CtrlCanvas::partControllers(const MidiPart* part, int num, int* dnum, int*
int di;
int n;
- if((mt->type() != Track::DRUM) && curDrumInstrument != -1)
+ if((mt->type() != Track::DRUM) && curDrumInstrument != -1) //FINDMICHJETZT was ist das?
printf("keyfilter != -1 in non drum track?\n");
- if((mt->type() == Track::DRUM) && (curDrumInstrument != -1) && ((num & 0xff) == 0xff))
+ if((mt->type() == Track::DRUM) && (curDrumInstrument != -1) && ((num & 0xff) == 0xff)) //FINDMICHJETZT was ist das?
{
di = (num & ~0xff) | curDrumInstrument;
n = (num & ~0xff) | drumMap[curDrumInstrument].anote; // construct real controller number
@@ -1688,7 +1688,7 @@ void CtrlCanvas::pdrawItems(QPainter& p, const QRect& rect, const MidiPart* part
MidiTrack* mt = part->track();
MidiPort* mp;
- if((mt->type() == Track::DRUM) && (curDrumInstrument != -1) && ((_cnum & 0xff) == 0xff))
+ if((mt->type() == Track::DRUM) && (curDrumInstrument != -1) && ((_cnum & 0xff) == 0xff)) //FINDMICHJETZT was ist das?
mp = &midiPorts[drumMap[curDrumInstrument].port];
else
mp = &midiPorts[mt->outPort()];
diff --git a/muse2/muse/ctrl/ctrlpanel.cpp b/muse2/muse/ctrl/ctrlpanel.cpp
index cb18afad..ef2196fa 100644
--- a/muse2/muse/ctrl/ctrlpanel.cpp
+++ b/muse2/muse/ctrl/ctrlpanel.cpp
@@ -169,7 +169,7 @@ void CtrlPanel::heartBeat()
int outport;
int chan;
int cdi = editor->curDrumInstrument();
- if(_track->type() == Track::DRUM && ((_ctrl->num() & 0xff) == 0xff) && cdi != -1)
+ if(_track->type() == Track::DRUM && ((_ctrl->num() & 0xff) == 0xff) && cdi != -1) //FINDMICHJETZT was ist das? und ähnliche dinger
{
outport = drumMap[cdi].port;
chan = drumMap[cdi].channel;
@@ -560,7 +560,7 @@ void CtrlPanel::ctrlPopup()
int channel = track->outChannel();
MidiPort* port = &midiPorts[track->outPort()];
int curDrumInstrument = editor->curDrumInstrument();
- bool isDrum = track->type() == Track::DRUM;
+ bool isDrum = track->type() == Track::DRUM; //FINDMICHJETZT ist das wichtig?
QMenu* pop = new QMenu;
//pop->clear();
@@ -718,7 +718,7 @@ void CtrlPanel::ctrlPopup()
int channel = track->outChannel();
MidiPort* port = &midiPorts[track->outPort()];
int curDrumInstrument = editor->curDrumInstrument();
- bool isDrum = track->type() == Track::DRUM;
+ bool isDrum = track->type() == Track::DRUM; //FINDMICHJETZT ist das wichtig?
MidiInstrument* instr = port->instrument();
MidiControllerList* mcl = instr->controller();