X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_actor.cc;h=073f4f8c11bd8b75caca488a4f6d5381c7b52368;hb=1dfee4813923f36401af771ee8731ec1ba3f20af;hp=8a90a3a1dd2e698882be2937d62584f872a838c8;hpb=0013feddbf260f0b57ee74786c316739806ea47a;p=ardour.git

diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc
index 8a90a3a1dd..073f4f8c11 100644
--- a/gtk2_ardour/mixer_actor.cc
+++ b/gtk2_ardour/mixer_actor.cc
@@ -35,10 +35,6 @@
 
 #include "i18n.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 using namespace ARDOUR;
 using namespace Gtk;
 using namespace PBD;
@@ -71,7 +67,7 @@ MixerActor::register_actions ()
 	myactions.register_action ("Mixer", "select-all-processors", _("Select All (visible) Processors"), sigc::mem_fun (*this, &MixerActor::select_all_processors));
 	myactions.register_action ("Mixer", "toggle-processors", _("Toggle Selected Processors"), sigc::mem_fun (*this, &MixerActor::toggle_processors));
 	myactions.register_action ("Mixer", "ab-plugins", _("Toggle Selected Plugins"), sigc::mem_fun (*this, &MixerActor::ab_plugins));
-
+	myactions.register_action ("Mixer", "select-none", _("Deselect all strips and processors"), sigc::mem_fun (*this, &MixerActor::select_none));
 
 	myactions.register_action ("Mixer", "scroll-left", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &MixerActor::scroll_left));
 	myactions.register_action ("Mixer", "scroll-right", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &MixerActor::scroll_right));
@@ -89,7 +85,7 @@ MixerActor::load_bindings ()
 
 	std::string binding_file;
 
-	if (find_file_in_search_path (ardour_config_search_path(), "mixer.bindings", binding_file)) {
+	if (find_file (ardour_config_search_path(), "mixer.bindings", binding_file)) {
                 bindings.load (binding_file);
 		info << string_compose (_("Loaded mixer bindings from %1"), binding_file) << endmsg;
         } else {
@@ -176,6 +172,7 @@ MixerActor::unity_gain_action ()
 {
 	set_route_targets_for_operation ();
 
+printf("setting gain to unity (?)");
 	BOOST_FOREACH(RouteUI* r, _route_targets) {
 		boost::shared_ptr<Route> rp = r->route();
 		if (rp) {
@@ -233,18 +230,6 @@ MixerActor::select_all_processors ()
 	}
 }
 void
-MixerActor::delete_processors ()
-{
-	set_route_targets_for_operation ();
-
-	BOOST_FOREACH(RouteUI* r, _route_targets) {
-		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
-		if (ms) {
-			ms->delete_processors ();
-		}
-	}
-}
-void
 MixerActor::toggle_processors ()
 {
 	set_route_targets_for_operation ();