diff options
| author | Florian Jung <flo@windfisch.org> | 2012-03-15 19:10:20 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-03-15 19:10:20 +0000 |
| commit | e232be5476afe17a3abc717f757e667832d9daa6 (patch) | |
| tree | 3653e77acb51a700572b89466640552cf3bbb250 /muse2/muse/arranger/tlist.cpp | |
| parent | 27b7bf6815cda7abb67026c37b3e44daee1803cb (diff) | |
custom columns only consider controller changes at tick0 now
Diffstat (limited to 'muse2/muse/arranger/tlist.cpp')
| -rw-r--r-- | muse2/muse/arranger/tlist.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index b5fa2a1a..77686ff2 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -425,7 +425,7 @@ void TList::paint(const QRect& r) MusECore::MidiTrack* mt=dynamic_cast<MusECore::MidiTrack*>(track); MusECore::MidiPort* mp = &MusEGlobal::midiPorts[mt->outPort()]; MusECore::MidiController* mctl = mp->midiController(col_ctrl_no); - int val=mt->getFirstControllerValue(col_ctrl_no,MusECore::CTRL_VAL_UNKNOWN); + int val=mt->getControllerValueAtTick(0,col_ctrl_no,MusECore::CTRL_VAL_UNKNOWN); if (val!=MusECore::CTRL_VAL_UNKNOWN) val-=mctl->bias(); @@ -810,7 +810,7 @@ void TList::mouseDoubleClickEvent(QMouseEvent* ev) ctrl_edit->setMinimum(mctl->minVal()-1); // -1 because of the specialValueText ctrl_edit->setMaximum(mctl->maxVal()); - ctrl_edit->setValue(((MusECore::MidiTrack*)editTrack)->getFirstControllerValue(ctrl_num)-mctl->bias()); + ctrl_edit->setValue(((MusECore::MidiTrack*)editTrack)->getControllerValueAtTick(0,ctrl_num)-mctl->bias()); int w=colw; if (w < ctrl_edit->sizeHint().width()) w=ctrl_edit->sizeHint().width(); ctrl_edit->setGeometry(colx, coly, w, colh); @@ -1858,7 +1858,7 @@ void TList::mousePressEvent(QMouseEvent* ev) int minval=mctl->minVal()+mctl->bias(); int maxval=mctl->maxVal()+mctl->bias(); - int val = mt->getFirstControllerValue(ctrl_num); + int val = mt->getControllerValueAtTick(0,ctrl_num); int oldval=val; if (ctrl_num!=MusECore::CTRL_PROGRAM) @@ -1919,7 +1919,6 @@ void TList::mousePressEvent(QMouseEvent* ev) MusECore::MidiTrack* mt=(MusECore::MidiTrack*)t; MusECore::MidiPort* mp = &MusEGlobal::midiPorts[mt->outPort()]; - MusECore::MidiController* mctl = mp->midiController(ctrl_num); MusECore::MidiInstrument* instr = mp->instrument(); PopupMenu* pup = new PopupMenu(true); @@ -2335,7 +2334,7 @@ void TList::wheelEvent(QWheelEvent* ev) int minval=mctl->minVal()+mctl->bias(); int maxval=mctl->maxVal()+mctl->bias(); - int val = mt->getFirstControllerValue(ctrl_num); + int val = mt->getControllerValueAtTick(0,ctrl_num); int oldval=val; if (ctrl_num!=MusECore::CTRL_PROGRAM) |