From da20e4ed608d1cfdd8290a00e0b3b17a49457deb Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 5 Apr 2022 18:04:30 -0600 Subject: [PATCH] change return type of Editor::process_redisplay_track_views() to bool This allows it to be used in an idle callback. If we use ::redisplay_track_views() directly, we do not disconnect the idle connection. This will happen automatically since the callback will return false, but it seems better to explicit about this. Even better would be to use ::connect_once() but this may not be available in the version of glibmm that we are using at present. --- gtk2_ardour/editor.cc | 9 ++------- gtk2_ardour/editor.h | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 7afd91d247..ac2f5152b7 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -5621,20 +5621,15 @@ Editor::queue_redisplay_track_views () } } -void +bool Editor::process_redisplay_track_views () { if (_tvl_redisplay_connection.connected ()) { _tvl_redisplay_connection.disconnect (); redisplay_track_views (); } -} -void -Editor::redisplay_track_views_now () -{ - _tvl_redisplay_connection.disconnect (); - redisplay_track_views (); + return false; } void diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 388bdfbd13..561d152e6e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1242,8 +1242,7 @@ private: Gtk::VBox list_vpacker; void queue_redisplay_track_views (); - void process_redisplay_track_views (); - void redisplay_track_views_now (); + bool process_redisplay_track_views (); bool redisplay_track_views (); // do not call this directly, use above wrappers bool _tvl_no_redisplay;