X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_actor.cc;h=d7a1149a4b29d6a5174522f97f3fee3119c8d344;hb=4aaae2eb3ba65f97e173b1751e1ee3bec8925ed5;hp=437da39babeab9cf6db98b30a6cdac1498c61140;hpb=813c5f0af9d1dac32b156ef3c72b890a7cf9eab5;p=ardour.git

diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc
index 437da39bab..d7a1149a4b 100644
--- a/gtk2_ardour/mixer_actor.cc
+++ b/gtk2_ardour/mixer_actor.cc
@@ -23,9 +23,7 @@
 
 #include <boost/foreach.hpp>
 
-#include "pbd/filesystem.h"
 #include "pbd/file_utils.h"
-#include "pbd/search_path.h"
 #include "pbd/error.h"
 
 #include "ardour/filesystem_paths.h"
@@ -73,6 +71,9 @@ MixerActor::register_actions ()
 
 	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));
+
+	myactions.register_action ("Mixer", "toggle-midi-input-active", _("Toggle MIDI Input Active for Mixer-Selected Tracks/Busses"), 
+				   sigc::bind (sigc::mem_fun (*this, &MixerActor::toggle_midi_input_active), false));
 }
 
 void
@@ -82,11 +83,11 @@ MixerActor::load_bindings ()
 	
         bindings.set_action_map (myactions);
 
-	sys::path binding_file;
+	std::string binding_file;
 
 	if (find_file_in_search_path (ardour_config_search_path(), "mixer.bindings", binding_file)) {
-                bindings.load (binding_file.to_string());
-		info << string_compose (_("Loaded mixer bindings from %1"), binding_file.to_string()) << endmsg;
+                bindings.load (binding_file);
+		info << string_compose (_("Loaded mixer bindings from %1"), binding_file) << endmsg;
         } else {
 		error << string_compose (_("Could not find mixer.bindings in search path %1"), ardour_config_search_path().to_string()) << endmsg;
 	}
@@ -263,3 +264,4 @@ MixerActor::ab_plugins ()
 		}
 	}
 }
+