summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-01-05 02:28:28 +0000
committerCarl Hetherington <carl@carlh.net>2011-01-05 02:28:28 +0000
commit85acf35337e73a1382a1ce3f1fa02470d75e487a (patch)
tree5fc10c780a9298fd7adff4e498e32592e9ba09ff /gtk2_ardour/editor.cc
parentd13cb3bd40b5d5ae54c3adfcf952e6f965e51d08 (diff)
Disable follow-playhead during drags. Fixes #3647.
git-svn-id: svn://localhost/ardour2/branches/3.0@8444 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 9c9444e3fc..881074f258 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3637,11 +3637,14 @@ Editor::toggle_follow_playhead ()
}
}
+/** @param yn true to follow playhead, otherwise false.
+ * @param catch_up true to reset the editor view to show the playhead (if yn == true), otherwise false.
+ */
void
-Editor::set_follow_playhead (bool yn)
+Editor::set_follow_playhead (bool yn, bool catch_up)
{
if (_follow_playhead != yn) {
- if ((_follow_playhead = yn) == true) {
+ if ((_follow_playhead = yn) == true && catch_up) {
/* catch up */
reset_x_origin_to_follow_playhead ();
}