summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc42
1 files changed, 21 insertions, 21 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 019d2f91e8..217d55bb9a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4001,71 +4001,71 @@ Editor::get_paste_offset (framepos_t pos, unsigned paste_count, framecnt_t durat
return offset;
}
-Evoral::MusicalTime
+Evoral::Beats
Editor::get_grid_type_as_beats (bool& success, framepos_t position)
{
success = true;
switch (_snap_type) {
case SnapToBeat:
- return Evoral::MusicalTime(1.0);
+ return Evoral::Beats(1.0);
break;
case SnapToBeatDiv128:
- return Evoral::MusicalTime(1.0/128.0);
+ return Evoral::Beats(1.0/128.0);
break;
case SnapToBeatDiv64:
- return Evoral::MusicalTime(1.0/64.0);
+ return Evoral::Beats(1.0/64.0);
break;
case SnapToBeatDiv32:
- return Evoral::MusicalTime(1.0/32.0);
+ return Evoral::Beats(1.0/32.0);
break;
case SnapToBeatDiv28:
- return Evoral::MusicalTime(1.0/28.0);
+ return Evoral::Beats(1.0/28.0);
break;
case SnapToBeatDiv24:
- return Evoral::MusicalTime(1.0/24.0);
+ return Evoral::Beats(1.0/24.0);
break;
case SnapToBeatDiv20:
- return Evoral::MusicalTime(1.0/20.0);
+ return Evoral::Beats(1.0/20.0);
break;
case SnapToBeatDiv16:
- return Evoral::MusicalTime(1.0/16.0);
+ return Evoral::Beats(1.0/16.0);
break;
case SnapToBeatDiv14:
- return Evoral::MusicalTime(1.0/14.0);
+ return Evoral::Beats(1.0/14.0);
break;
case SnapToBeatDiv12:
- return Evoral::MusicalTime(1.0/12.0);
+ return Evoral::Beats(1.0/12.0);
break;
case SnapToBeatDiv10:
- return Evoral::MusicalTime(1.0/10.0);
+ return Evoral::Beats(1.0/10.0);
break;
case SnapToBeatDiv8:
- return Evoral::MusicalTime(1.0/8.0);
+ return Evoral::Beats(1.0/8.0);
break;
case SnapToBeatDiv7:
- return Evoral::MusicalTime(1.0/7.0);
+ return Evoral::Beats(1.0/7.0);
break;
case SnapToBeatDiv6:
- return Evoral::MusicalTime(1.0/6.0);
+ return Evoral::Beats(1.0/6.0);
break;
case SnapToBeatDiv5:
- return Evoral::MusicalTime(1.0/5.0);
+ return Evoral::Beats(1.0/5.0);
break;
case SnapToBeatDiv4:
- return Evoral::MusicalTime(1.0/4.0);
+ return Evoral::Beats(1.0/4.0);
break;
case SnapToBeatDiv3:
- return Evoral::MusicalTime(1.0/3.0);
+ return Evoral::Beats(1.0/3.0);
break;
case SnapToBeatDiv2:
- return Evoral::MusicalTime(1.0/2.0);
+ return Evoral::Beats(1.0/2.0);
break;
case SnapToBar:
if (_session) {
- return Evoral::MusicalTime(_session->tempo_map().meter_at (position).divisions_per_bar());
+ return Evoral::Beats(_session->tempo_map().meter_at (position).divisions_per_bar());
}
break;
@@ -4084,7 +4084,7 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position)
break;
}
- return Evoral::MusicalTime();
+ return Evoral::Beats();
}
framecnt_t