summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_list_editor.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-01-07 00:12:07 -0500
committerDavid Robillard <d@drobilla.net>2015-01-07 00:12:07 -0500
commit2a251b457069ffb4b744fbd0dd7aca7acb31f381 (patch)
tree4311e63fe7ef1b5d7a5b841a4dd0eb7b26b324a7 /gtk2_ardour/midi_list_editor.cc
parent4d202d9157bef5b6325fe54b7874080952f86a37 (diff)
MusicalTime => Beats.
Diffstat (limited to 'gtk2_ardour/midi_list_editor.cc')
-rw-r--r--gtk2_ardour/midi_list_editor.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index ab282f2a23..4c7a30cdd9 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -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 ();