From 9384b4df3747bb2810f82c83d7e5b1e5df748820 Mon Sep 17 00:00:00 2001 From: VKamyshniy Date: Sun, 14 Dec 2014 00:15:38 +0200 Subject: [PATCH] [Summary] Fixing the bug: Inspector's Info Panel did not update upon started Tracks Live --- gtk2_ardour/mixer_strip.h | 2 -- gtk2_ardour/route_inspector.cc | 26 ++++++++++++++------------ gtk2_ardour/route_inspector.h | 2 ++ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 619b52eaff..3fcd64da38 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -137,8 +137,6 @@ class MixerStrip : public RouteUI PublicEditor& _editor; - PBD::ScopedConnectionList _input_output_channels_update; - private: void init (); diff --git a/gtk2_ardour/route_inspector.cc b/gtk2_ardour/route_inspector.cc index 4f7691d9ef..eaa349080e 100644 --- a/gtk2_ardour/route_inspector.cc +++ b/gtk2_ardour/route_inspector.cc @@ -93,9 +93,9 @@ RouteInspector::~RouteInspector () void RouteInspector::update_inspector_info_panel () { - if(!route ()) + if (!route ()) { return; - + } // Input label std::string input_text; @@ -185,17 +185,19 @@ void RouteInspector::set_route (boost::shared_ptr rt) { MixerStrip::set_route (rt); - - if (route()->is_master()) { - master_mute_button.show (); - color_buttons_home.set_visible (false); - color_palette_button.set_visible (false); - color_palette_button.set_active (false); - } else { - master_mute_button.hide (); - color_palette_button.set_visible (true); - color_palette_home.set_visible (true); + if (route ()) { + if (route()->is_master()) { + master_mute_button.show (); + color_buttons_home.set_visible (false); + color_palette_button.set_visible (false); + color_palette_button.set_active (false); + } else { + master_mute_button.hide (); + color_palette_button.set_visible (true); + color_palette_home.set_visible (true); + } } + update_inspector_info_panel (); } void diff --git a/gtk2_ardour/route_inspector.h b/gtk2_ardour/route_inspector.h index 62c96ea5ea..5823d58cc6 100644 --- a/gtk2_ardour/route_inspector.h +++ b/gtk2_ardour/route_inspector.h @@ -47,6 +47,8 @@ class RouteInspector : public MixerStrip void update_info_panel (); WavesButton* color_button[15]; + PBD::ScopedConnectionList _input_output_channels_update; + void route_color_changed (); void color_button_clicked (WavesButton *button); void color_palette_button_clicked (WavesButton *button);