summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-11-14 09:24:23 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-11-14 09:24:23 +0000
commit751c8022efa197a06e3928bfd1956685fbd44eb8 (patch)
tree210c81d65fdf69ecaf3ee2f5e4fce061eebb033b
parentecaaa71dda96183f3d97c9db88d3063f7cf959f1 (diff)
back out "ignore_gui_changes" stuff for track resizing
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4164 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/editor.cc5
-rw-r--r--gtk2_ardour/editor_route_list.cc4
2 files changed, 0 insertions, 9 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3d6ce6e7c4..d163dba6ac 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -300,7 +300,6 @@ Editor::Editor ()
show_gain_after_trim = false;
route_redisplay_does_not_sync_order_keys = false;
route_redisplay_does_not_reset_order_keys = false;
- ignore_gui_changes = false;
no_route_list_redisplay = false;
verbose_cursor_on = true;
route_removal = false;
@@ -4959,14 +4958,10 @@ Editor::add_to_idle_resize (TimeAxisView* view, uint32_t h)
bool
Editor::idle_resize ()
{
- cerr << "idle resize to " << resize_idle_target << endl;
- ignore_gui_changes = true;
for (vector<TimeAxisView*>::iterator i = pending_resizes.begin(); i != pending_resizes.end(); ++i) {
(*i)->idle_resize (resize_idle_target);
}
pending_resizes.clear();
- ignore_gui_changes = false;
- handle_gui_changes ("track_height", this);
flush_canvas ();
resize_idle_id = -1;
return false;
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 36f470ea09..b62865c585 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -101,10 +101,6 @@ Editor::handle_gui_changes (const string & what, void *src)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::handle_gui_changes), what, src));
- if (ignore_gui_changes) {
- return;
- }
-
if (what == "track_height") {
/* Optional :make tracks change height while it happens, instead
of on first-idle