Fix session-open after selecting new, template, then back

[ardour.git] / gtk2_ardour / editor_drag.cc

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 15d4b61b351a7d0cc46f10c94f68eef1b73d5f73..02f827b5792874ffada6eb70dc335899c2aa514e 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3308,10 +3308,9 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
                        } else {
                                --bbt.bars;
                        }
-                       const double beat = map.beat_at_bbt (bbt);
-                       const framepos_t frame = map.frame_at_beat (beat);
+                       const framepos_t frame = map.frame_at_bbt (bbt);
                        _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor())
-                                                      , beat, bbt, frame, _real_section->position_lock_style());
+                                                      , bbt, frame, _real_section->position_lock_style());
                        if (!_real_section) {
                                aborted (true);
                                return;
@@ -3548,6 +3547,7 @@ BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i)
        , _grab_qn (0.0)
        , _tempo (0)
        , _before_state (0)
+       , _drag_valid (true)
 {
        DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n");
 
@@ -3559,13 +3559,18 @@ BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
        Drag::start_grab (event, cursor);
        TempoMap& map (_editor->session()->tempo_map());
        _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame()));
+
+       if (adjusted_current_frame (event, false) <= _tempo->frame()) {
+               _drag_valid = false;
+               return;
+       }
+
        _editor->tempo_curve_selected (_tempo, true);
 
        ostringstream sstr;
        if (_tempo->clamped()) {
                TempoSection* prev = map.previous_tempo_section (_tempo);
                if (prev) {
-                       _editor->tempo_curve_selected (prev, true);
                        sstr << "end: " << fixed << setprecision(3) << prev->end_note_types_per_minute() << "\n";
                }
        }
@@ -3604,12 +3609,15 @@ BBTRulerDrag::setup_pointer_frame_offset ()
 void
 BBTRulerDrag::motion (GdkEvent* event, bool first_move)
 {
-       TempoMap& map (_editor->session()->tempo_map());
+       if (!_drag_valid) {
+               return;
+       }
 
        if (first_move) {
                _editor->begin_reversible_command (_("stretch tempo"));
        }
 
+       TempoMap& map (_editor->session()->tempo_map());
        framepos_t pf;
 
        if (_editor->snap_musical()) {
@@ -3620,7 +3628,7 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move)
 
        if (ArdourKeyboard::indicates_constraint (event->button.state)) {
                /* adjust previous tempo to match pointer frame */
-               _editor->session()->tempo_map().gui_stretch_tempo (_tempo, map.frame_at_quarter_note (_grab_qn), pf);
+               _editor->session()->tempo_map().gui_stretch_tempo (_tempo, map.frame_at_quarter_note (_grab_qn), pf, _grab_qn, map.quarter_note_at_frame (pf));
        }
 
        ostringstream sstr;
@@ -3644,17 +3652,22 @@ BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred)
 
        TempoMap& map (_editor->session()->tempo_map());
 
-       XMLNode &after = map.get_state();
-       _editor->session()->add_command(new MementoCommand<TempoMap>(map, _before_state, &after));
-       _editor->commit_reversible_command ();
        _editor->tempo_curve_selected (_tempo, false);
-
        if (_tempo->clamped()) {
                TempoSection* prev_tempo = map.previous_tempo_section (_tempo);
                if (prev_tempo) {
                        _editor->tempo_curve_selected (prev_tempo, false);
                }
        }
+
+       if (!movement_occurred || !_drag_valid) {
+               return;
+       }
+
+       XMLNode &after = map.get_state();
+       _editor->session()->add_command(new MementoCommand<TempoMap>(map, _before_state, &after));
+       _editor->commit_reversible_command ();
+
 }
 
 void
@@ -3687,6 +3700,11 @@ TempoTwistDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
        _before_state = &map.get_state();
        _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame()));
 
+       if (_tempo->locked_to_meter()) {
+               _drag_valid = false;
+               return;
+       }
+
        _next_tempo = map.next_tempo_section (_tempo);
        if (_next_tempo) {
                if (!map.next_tempo_section (_next_tempo)) {
@@ -3770,8 +3788,6 @@ TempoTwistDrag::motion (GdkEvent* event, bool first_move)
 void
 TempoTwistDrag::finished (GdkEvent* event, bool movement_occurred)
 {
-       TempoMap& map (_editor->session()->tempo_map());
-
        if (!movement_occurred || !_drag_valid) {
                return;
        }
@@ -3779,6 +3795,7 @@ TempoTwistDrag::finished (GdkEvent* event, bool movement_occurred)
        _editor->tempo_curve_selected (_tempo, false);
        _editor->tempo_curve_selected (_next_tempo, false);
 
+       TempoMap& map (_editor->session()->tempo_map());
        XMLNode &after = map.get_state();
        _editor->session()->add_command(new MementoCommand<TempoMap>(map, _before_state, &after));
        _editor->commit_reversible_command ();
@@ -3797,6 +3814,7 @@ TempoEndDrag::TempoEndDrag (Editor* e, ArdourCanvas::Item* i)
        , _grab_qn (0.0)
        , _tempo (0)
        , _before_state (0)
+       , _drag_valid (true)
 {
        DEBUG_TRACE (DEBUG::Drags, "New TempoEndDrag\n");
        TempoMarker* marker = reinterpret_cast<TempoMarker*> (_item->get_data ("marker"));
@@ -3813,6 +3831,10 @@ TempoEndDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
        /* get current state */
        _before_state = &tmap.get_state();
 
+       if (_tempo->locked_to_meter()) {
+               _drag_valid = false;
+               return;
+       }
 
        ostringstream sstr;
 
@@ -3842,14 +3864,16 @@ TempoEndDrag::setup_pointer_frame_offset ()
 void
 TempoEndDrag::motion (GdkEvent* event, bool first_move)
 {
+       if (!_drag_valid) {
+               return;
+       }
+
        TempoMap& map (_editor->session()->tempo_map());
 
        if (first_move) {
                _editor->begin_reversible_command (_("stretch end tempo"));
        }
 
-
-
        framepos_t const pf = adjusted_current_frame (event, false);
        map.gui_stretch_tempo_end (&map.tempo_section_at_frame (_tempo->frame() - 1), map.frame_at_quarter_note (_grab_qn), pf);
 
@@ -3866,7 +3890,7 @@ TempoEndDrag::motion (GdkEvent* event, bool first_move)
 void
 TempoEndDrag::finished (GdkEvent* event, bool movement_occurred)
 {
-       if (!movement_occurred) {
+       if (!movement_occurred || !_drag_valid) {
                return;
        }
 
@@ -4007,13 +4031,13 @@ CursorDrag::motion (GdkEvent* event, bool)
                double dy = fabs(my - _last_my);
 
                {
-                       //do zooming in windowed "steps" so it feels more reversible
-                       const int stepsize = 4;
+                       //do zooming in windowed "steps" so it feels more reversible ?
+                       const int stepsize = 2;  //stepsize ==1  means "trigger on every pixel of movement"
                        int y_delta = grab_y() - current_pointer_y();
                        y_delta = y_delta / stepsize;
 
                        //if all requirements are met, do the actual zoom
-                       const double scale = 1.4;
+                       const double scale = 1.2;
                        if ( (dy>dx) && (_last_dx ==0) && (y_delta != _last_y_delta) ) {
                                if ( _last_y_delta > y_delta ) {
                                        _editor->temporal_zoom_step_mouse_focus_scale (true, scale);