From 0fba3e073cc274b6cd3d6ac02d1eecf7bbd5cc5a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Jun 2012 14:14:22 +0000 Subject: [PATCH] Remove indirected method calls. git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.cc | 38 +++++++++----------------------------- gtk2_ardour/editor.h | 4 ---- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e3e00cf340..ab2f92823c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4048,19 +4048,25 @@ Editor::on_key_release_event (GdkEventKey* ev) void Editor::reset_x_origin (framepos_t frame) { - queue_visual_change (frame); + pending_visual_change.add (VisualChange::TimeOrigin); + pending_visual_change.time_origin = frame; + ensure_visual_change_idle_handler (); } void Editor::reset_y_origin (double y) { - queue_visual_change_y (y); + pending_visual_change.add (VisualChange::YOrigin); + pending_visual_change.y_origin = y; + ensure_visual_change_idle_handler (); } void Editor::reset_zoom (double fpu) { - queue_visual_change (fpu); + pending_visual_change.add (VisualChange::ZoomLevel); + pending_visual_change.frames_per_unit = fpu; + ensure_visual_change_idle_handler (); } void @@ -4233,32 +4239,6 @@ Editor::post_zoom () instant_save (); } -void -Editor::queue_visual_change (framepos_t where) -{ - pending_visual_change.add (VisualChange::TimeOrigin); - pending_visual_change.time_origin = where; - ensure_visual_change_idle_handler (); -} - -void -Editor::queue_visual_change (double fpu) -{ - pending_visual_change.add (VisualChange::ZoomLevel); - pending_visual_change.frames_per_unit = fpu; - - ensure_visual_change_idle_handler (); -} - -void -Editor::queue_visual_change_y (double y) -{ - pending_visual_change.add (VisualChange::YOrigin); - pending_visual_change.y_origin = y; - - ensure_visual_change_idle_handler (); -} - void Editor::ensure_visual_change_idle_handler () { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 3fd38ec609..5bfc7b127e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1041,10 +1041,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD static int _idle_visual_changer (void *arg); int idle_visual_changer (); - - void queue_visual_change (framepos_t); - void queue_visual_change (double); - void queue_visual_change_y (double); void ensure_visual_change_idle_handler (); /* track views */