Tempo ramps - redraw correctly when changing meter lock style.
authornick_m <mainsbridge@gmail.com>
Wed, 13 Apr 2016 18:47:16 +0000 (04:47 +1000)
committernick_m <mainsbridge@gmail.com>
Fri, 27 May 2016 13:38:15 +0000 (23:38 +1000)
gtk2_ardour/editor_markers.cc

index 3d5977ed761468bf9df842ef08e1bceab7282599..86a6b68b88ff5ce8906e4e77219931a15befb684 100644 (file)
@@ -1389,10 +1389,12 @@ Editor::toggle_marker_lock_style ()
        dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
 
        if (mm) {
+               MeterSection* msp = &mm->meter();
+
                if (mm->meter().position_lock_style() == AudioTime) {
-                       mm->meter().set_position_lock_style (MusicTime);
+                       _session->tempo_map().replace_meter (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt());
                } else {
-                       mm->meter().set_position_lock_style (AudioTime);
+                       _session->tempo_map().replace_meter (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->frame());
                }
        } else if (tm) {
                if (tm->tempo().position_lock_style() == AudioTime) {