Use uint32_t type instead of uint

[ardour.git] / gtk2_ardour / mixer_actor.cc

diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc
index b309b9fd7f7d58fa44c9f3575747a17dcd188e10..d7a1149a4b29d6a5174522f97f3fee3119c8d344 100644 (file)
--- 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,14 +83,13 @@ MixerActor::load_bindings ()
        
         bindings.set_action_map (myactions);
 
-       sys::path binding_file;
-       SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
+       std::string binding_file;
 
-       if (find_file_in_search_path (spath, "mixer.bindings", binding_file)) {
-                bindings.load (binding_file.to_string());
-               info << string_compose (_("Loaded mixer bindings from %1"), binding_file.to_string()) << endmsg;
+       if (find_file_in_search_path (ardour_config_search_path(), "mixer.bindings", binding_file)) {
+                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"), spath.to_string()) << endmsg;
+               error << string_compose (_("Could not find mixer.bindings in search path %1"), ardour_config_search_path().to_string()) << endmsg;
        }
 }
 
@@ -264,3 +264,4 @@ MixerActor::ab_plugins ()
                }
        }
 }
+