ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Paul Davis 2020-01-05 18:34:40 -07:00
parent ece18d3083
commit d17a89c9a7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/globals.cc
View File

@ -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;

5
libs/ardour/session_state.cc
View File

@ -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);