diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-23 19:18:11 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-23 19:18:11 +0000 |
| commit | dc2ad95bfb766f7720f2bf58cae480b3ecaeade0 (patch) | |
| tree | 8ee771dff108e936a26e11eac4c7acfad79e0442 | |
| parent | 686b642dc0e894439fdc467ec4893a5c7aae4b48 (diff) | |
Don't update rulers twice in idle_visual_changer, temporarily remove parts of 4001
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4003 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 6 |
2 files changed, 0 insertions, 14 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index b7e5985497..45f7637333 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4415,15 +4415,7 @@ Editor::idle_visual_changer () } if (p & VisualChange::TimeOrigin) { - - nframes64_t current_time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); - horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit); - - if (current_time_origin != pending_visual_change.time_origin) { - update_fixed_rulers(); - redisplay_tempo (true); - } } //cerr << "Editor::idle_visual_changer () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index daa820a7ad..65bc87d5bc 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -800,12 +800,6 @@ Editor::scroll_canvas_horizontally () cursor_group->move (-x_delta, 0); update_fixed_rulers (); redisplay_tempo (true); - if (!autoscroll_active) { - /* force rulers and canvas to move in lock step */ - while (gtk_events_pending ()) { - gtk_main_iteration (); - } - } } void |