move MidiPatchManager initialization into ARDOUR "global" scope, rather than per...

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index de4fc2a07cacce40a225eef01e4649953d59dd93..8a80c78b372dec88392de7694e6650ed209708ea 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -111,6 +111,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_ui.h"
+#include "ardour/midi_patch_manager.h"
 #include "ardour/midiport_manager.h"
 #include "ardour/mix.h"
 #include "ardour/operations.h"
@@ -611,6 +612,8 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
        reserved_io_names[_("FaderPort16 Recv")] = false;
        reserved_io_names[_("FaderPort16 Send")] = false;
 
+       MIDI::Name::MidiPatchManager::instance().load_midnams_in_thread ();
+
        libardour_initialized = true;
 
        return true;

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 41668052c352e286dd05caf2654aed7fbaa30fea..f67c5df66cb4c53dad7e8ea80ea961a02923fe9c 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -105,7 +105,6 @@
 #include "ardour/lv2_plugin.h"
 #endif
 #include "ardour/midi_model.h"
-#include "ardour/midi_patch_manager.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_scene_changer.h"
 #include "ardour/midi_source.h"
@@ -397,10 +396,6 @@ Session::post_engine_init ()
 
        ltc_tx_initialize();
 
-       MIDI::Name::MidiPatchManager::instance().add_search_path (session_directory().midi_patch_path() );
-       MIDI::Name::MidiPatchManager::instance().load_midnams_in_thread ();
-       /* initial program change will be delivered later; see ::config_changed() */
-
        _state_of_the_state = Clean;
 
        Port::set_connecting_blocked (false);