ardour/livetrax
13
0
Fork 0
Code

Disable follow playhead during editor summary drags.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8518 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-01-16 19:33:16 +00:00
parent b6b0bce678
commit ad314252f4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/editor_summary.cc
View File

@ -50,7 +50,8 @@ EditorSummary::EditorSummary (Editor* e)
_moved (false), _moved (false),
_view_rectangle_x (0, 0), _view_rectangle_x (0, 0),
_view_rectangle_y (0, 0), _view_rectangle_y (0, 0),
_zoom_dragging (false) _zoom_dragging (false),
_old_follow_playhead (false)
{ {
Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context()); Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context());
_editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), ui_bind (&EditorSummary::playhead_position_changed, this, _1), gui_context()); _editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), ui_bind (&EditorSummary::playhead_position_changed, this, _1), gui_context());
@ -322,6 +323,8 @@ EditorSummary::on_button_press_event (GdkEventButton* ev)
_zoom_position = get_position (ev->x, ev->y); _zoom_position = get_position (ev->x, ev->y);
_zoom_dragging = true; _zoom_dragging = true;
_editor->_dragging_playhead = true; _editor->_dragging_playhead = true;
_old_follow_playhead = _editor->follow_playhead ();
_editor->set_follow_playhead (false);
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
@ -341,6 +344,8 @@ EditorSummary::on_button_press_event (GdkEventButton* ev)
_move_dragging = true; _move_dragging = true;
_moved = false; _moved = false;
_editor->_dragging_playhead = true; _editor->_dragging_playhead = true;
_old_follow_playhead = _editor->follow_playhead ();
_editor->set_follow_playhead (false);
} }
} }
@ -523,6 +528,8 @@ EditorSummary::on_button_release_event (GdkEventButton*)
_move_dragging = false; _move_dragging = false;
_zoom_dragging = false; _zoom_dragging = false;
_editor->_dragging_playhead = false; _editor->_dragging_playhead = false;
_editor->set_follow_playhead (_old_follow_playhead);
return true; return true;
} }

2
gtk2_ardour/editor_summary.h
View File

@ -106,6 +106,8 @@ private:
bool _zoom_dragging; bool _zoom_dragging;
Position _zoom_position; Position _zoom_position;
bool _old_follow_playhead;
PBD::ScopedConnectionList position_connection; PBD::ScopedConnectionList position_connection;
PBD::ScopedConnectionList region_property_connection; PBD::ScopedConnectionList region_property_connection;
}; };