From: Robin Gareus <robin@gareus.org>
Date: Sun, 27 Dec 2015 18:11:07 +0000 (+0100)
Subject: allow to hide monitor-section processor box with processors
X-Git-Tag: 4.5~98
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=f09c1016d47cdb69488997a49b88d8334df3539c

allow to hide monitor-section processor box with processors

indicate processors by coloring the button instead.
---

diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index da73afc342..c78e566d99 100644
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -259,6 +259,7 @@
     <ColorAlias name="midi input button: fill active" alias="color 48"/>
     <ColorAlias name="monitor section button: fill active" alias="color 42"/>
     <ColorAlias name="monitor processors toggle: fill active" alias="color 42"/>
+    <ColorAlias name="monitor processors present: fill" alias="color 20"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
     <ColorAlias name="midi meter color0" alias="color 52"/>
     <ColorAlias name="midi meter color1" alias="color 53"/>
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index d1047271dd..605a96464b 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -190,7 +190,7 @@ MonitorSection::MonitorSection (Session* s)
 
 	proctoggle = ToggleAction::create ();
 	toggle_processorbox_button.set_related_action (proctoggle);
-	proctoggle->signal_toggled().connect (sigc::mem_fun(*this, &MonitorSection::repack_processor_box), false);
+	proctoggle->signal_toggled().connect (sigc::mem_fun(*this, &MonitorSection::update_processor_box), false);
 
 	/* Knobs */
 	Label* solo_boost_label;
@@ -477,7 +477,7 @@ MonitorSection::MonitorSection (Session* s)
 	_tearoff->tearoff_window().signal_key_press_event().connect (sigc::ptr_fun (forward_key_press), false);
 
 	update_output_display ();
-	repack_processor_box ();
+	update_processor_box ();
 	_ui_initialized = true;
 
 	/* catch changes that affect us */
@@ -513,16 +513,14 @@ MonitorSection::~MonitorSection ()
 
 
 void
-MonitorSection::repack_processor_box ()
+MonitorSection::update_processor_box ()
 {
 	bool show_processor_box = proctoggle->get_active ();
 
-	if (count_processors () > 0) {
-		proctoggle->set_active (true);
-		proctoggle->set_sensitive (false);
-		show_processor_box = true;
+	if (count_processors () > 0 && !show_processor_box) {
+		toggle_processorbox_button.set_name (X_("monitor processors present"));
 	} else {
-		proctoggle->set_sensitive (true);
+		toggle_processorbox_button.set_name (X_("monitor processors toggle"));
 	}
 
 	if (insert_box->is_visible() == show_processor_box) {
@@ -564,7 +562,7 @@ MonitorSection::set_session (Session* s)
 			insert_box->set_route (_route);
 			_route->processors_changed.connect (*this, invalidator (*this), boost::bind (&MonitorSection::processors_changed, this, _1), gui_context());
 			if (_ui_initialized) {
-				repack_processor_box ();  // too early
+				update_processor_box ();
 			}
 		} else {
 			/* session with no monitor section */
@@ -1620,5 +1618,5 @@ MonitorSection::count_processors ()
 void
 MonitorSection::processors_changed (ARDOUR::RouteProcessorChange)
 {
-	repack_processor_box ();
+	update_processor_box ();
 }
diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index bca55b7023..c8aed68dcb 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -166,7 +166,7 @@ class MonitorSection : public RouteUI
 
 	void port_connected_or_disconnected (boost::weak_ptr<ARDOUR::Port>, boost::weak_ptr<ARDOUR::Port>);
 
-	void repack_processor_box ();
+	void update_processor_box ();
 
 	ProcessorBox* insert_box;
 	PluginSelector* _plugin_selector;