ardour/livetrax
13
0
Fork 0
Code

Split transpose in MidiModel into two functions.

Browse Source
This commit is contained in:
André Nusser 2015-10-15 15:36:17 +02:00 committed by Paul Davis
parent bc83699e44
commit 66f18914b2
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/midi_model.h
View File

@ -287,6 +287,7 @@ public:
boost::shared_ptr<Evoral::Control> control_factory(const Evoral::Parameter& id);
void insert_silence_at_start (TimeType);
void transpose (NoteDiffCommand *, const NotePtr, int);
void transpose (TimeType, TimeType, int);
std::set<WeakNotePtr>& active_notes() { return _active_notes; }

25
libs/ardour/midi_model.cc
View File

@ -1983,6 +1983,20 @@ MidiModel::insert_silence_at_start (TimeType t)
}
}
void
MidiModel::transpose (NoteDiffCommand* c, const NotePtr note_ptr, int semitones)
{
int new_note = note_ptr->note() + semitones;
if (new_note < 0) {
new_note = 0;
} else if (new_note > 127) {
new_note = 127;
}
c->change (note_ptr, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
}
/** Transpose notes in a time range by a given number of semitones. Notes
* will be clamped at 0 and 127 if the transposition would make them exceed
* that range.
@ -2007,16 +2021,7 @@ MidiModel::transpose (TimeType from, TimeType to, int semitones)
} else if ((*i)->time() >= from) {
int new_note = (*i)->note() + semitones;
if (new_note < 0) {
new_note = 0;
} else if (new_note > 127) {
new_note = 127;
}
c->change (*i, NoteDiffCommand::NoteNumber, (uint8_t) new_note);
transpose (c, *i, semitones);
}
}