smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

MusicalTime => Beats.

Browse source
This commit is contained in:
David Robillard 2015-01-07 00:12:07 -05:00
parent 4d202d9157
commit 2a251b4570
66 changed files with 625 additions and 584 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/midi_list_editor.cc
View file

@ -292,7 +292,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
if (note->time() + fdelta >= 0) {
cmd->change (note, prop, note->time() + fdelta);
} else {
cmd->change (note, prop, Evoral::MusicalTime());
cmd->change (note, prop, Evoral::Beats());
}
break;
case MidiModel::NoteDiffCommand::Velocity:
@ -300,10 +300,10 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
break;
case MidiModel::NoteDiffCommand::Length:
if (note->length().to_double() + fdelta >=
Evoral::MusicalTime::tick().to_double()) {
Evoral::Beats::tick().to_double()) {
cmd->change (note, prop, note->length() + fdelta);
} else {
cmd->change (note, prop, Evoral::MusicalTime::tick());
cmd->change (note, prop, Evoral::Beats::tick());
}
break;
case MidiModel::NoteDiffCommand::Channel:
@ -335,7 +335,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
if (note->time() + fdelta >= 0) {
cmd->change (note, prop, note->time() + fdelta);
} else {
cmd->change (note, prop, Evoral::MusicalTime());
cmd->change (note, prop, Evoral::Beats());
}
break;
case MidiModel::NoteDiffCommand::Velocity:
@ -343,10 +343,10 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
break;
case MidiModel::NoteDiffCommand::Length:
if (note->length() + fdelta >=
Evoral::MusicalTime::tick().to_double()) {
Evoral::Beats::tick().to_double()) {
cmd->change (note, prop, note->length() + fdelta);
} else {
cmd->change (note, prop, Evoral::MusicalTime::tick());
cmd->change (note, prop, Evoral::Beats::tick());
}
break;
case MidiModel::NoteDiffCommand::Channel:
@ -773,7 +773,7 @@ MidiListEditor::redisplay_model ()
row[columns.start] = ss.str();
bbt.bars = 0;
const Evoral::MusicalTime dur = (*i)->end_time() - (*i)->time();
const Evoral::Beats dur = (*i)->end_time() - (*i)->time();
bbt.beats = dur.get_beats ();
bbt.ticks = dur.get_ticks ();