Merge branch 'master' into windows

[ardour.git] / libs / surfaces / generic_midi / generic_midi_control_protocol.cc

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 2820b069dc7af246917dd417ce851e3478e262c1..e0b06a936984ead8f1c10da783f41bb77839ff32 100644 (file)
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -60,8 +60,8 @@ GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s)
        , _threshold (10)
        , gui (0)
 {
-       _input_port = AudioEngine::instance()->midi_input_port ();
-       _output_port = AudioEngine::instance()->midi_output_port ();
+       _input_port = s.midi_input_port ();
+       _output_port = s.midi_output_port ();
 
        do_feedback = false;
        _feedback_interval = 10000; // microseconds
@@ -107,7 +107,7 @@ static const char * const midimap_env_variable_name = "ARDOUR_MIDIMAPS_PATH";
 static const char* const midi_map_dir_name = "midi_maps";
 static const char* const midi_map_suffix = ".map";
 
-SearchPath
+Searchpath
 system_midi_map_search_path ()
 {
        bool midimap_path_defined = false;
@@ -117,7 +117,7 @@ system_midi_map_search_path ()
                return spath_env;
        }
 
-       SearchPath spath (ardour_data_search_path());
+       Searchpath spath (ardour_data_search_path());
        spath.add_subdirectory_to_paths(midi_map_dir_name);
        return spath;
 }
@@ -129,7 +129,7 @@ user_midi_map_directory ()
 }
 
 static bool
-midi_map_filter (const string &str, void */*arg*/)
+midi_map_filter (const string &str, void* /*arg*/)
 {
        return (str.length() > strlen(midi_map_suffix) &&
                str.find (midi_map_suffix) == (str.length() - strlen (midi_map_suffix)));
@@ -140,7 +140,7 @@ GenericMidiControlProtocol::reload_maps ()
 {
        vector<string *> *midi_maps;
        PathScanner scanner;
-       SearchPath spath (system_midi_map_search_path());
+       Searchpath spath (system_midi_map_search_path());
        spath += user_midi_map_directory ();
 
        midi_maps = scanner (spath.to_string(), midi_map_filter, 0, false, true);