diff options
| author | David Robillard <d@drobilla.net> | 2014-11-22 04:05:42 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-11-22 04:05:42 -0500 |
| commit | c1cfa12d6e5136d2e3e5501e83ff74c5009a9e60 (patch) | |
| tree | 56d2811bc8b9d6f2a5accfa8e497ddd5976c7c7a /gtk2_ardour/step_entry.cc | |
| parent | cae74309a583c29dd6cc2081425c2e7b673ea13e (diff) | |
Wrap MusicalTime in a class.
This lets us get a more explicit handle on time conversions, and is the main
step towards using actual beat:tick time and getting away from floating point
precision problems.
Diffstat (limited to 'gtk2_ardour/step_entry.cc')
| -rw-r--r-- | gtk2_ardour/step_entry.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index ac13770a29..607f4abd62 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -526,13 +526,13 @@ StepEntry::on_key_release_event (GdkEventKey* ev) void StepEntry::rest_event_handler () { - se->step_edit_rest (0.0); + se->step_edit_rest (Evoral::MusicalTime()); } Evoral::MusicalTime StepEntry::note_length () { - Evoral::MusicalTime base_time = 4.0 / (Evoral::MusicalTime) length_divisor_adjustment.get_value(); + double base_time = 4.0 / (double) length_divisor_adjustment.get_value(); RefPtr<Action> act = myactions.find_action ("StepEditing/toggle-triplet"); RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act); @@ -549,7 +549,7 @@ StepEntry::note_length () base_time *= 1 + ((dots - 1.0)/dots); } - return base_time; + return Evoral::MusicalTime(base_time); } uint8_t @@ -795,7 +795,7 @@ StepEntry::insert_rest () void StepEntry::insert_grid_rest () { - se->step_edit_rest (0.0); + se->step_edit_rest (Evoral::MusicalTime()); } void |