make MIDI Patch Manager search in $user_config_dir/patchfiles for midnam files as well as the per-session equivalent. need to stop it from doing at session shutdown time too.

git-svn-id: svn://localhost/ardour2/branches/3.0@11736 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 52 insertions, 10 deletions

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index 2c2f36daa6..d3d080a179 100644
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -27,6 +27,7 @@
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
+#include "ardour/midi_patch_search_path.h"
 
 #include "i18n.h"
 
@@ -39,27 +40,28 @@ using namespace PBD::sys;
 
 MidiPatchManager* MidiPatchManager::_manager = 0;
 
+MidiPatchManager::MidiPatchManager ()
+{
+	refresh ();
+}
+
 void
 MidiPatchManager::set_session (Session* s)
 {
 	SessionHandlePtr::set_session (s);
-	refresh();
+	add_session_patches ();
 }
 
 void
-MidiPatchManager::refresh()
+MidiPatchManager::add_session_patches ()
 {
-	_documents.clear();
-	_master_devices_by_model.clear();
-	_all_models.clear();
-
 	if (!_session) {
 		return;
 	}
-
+	
 	path path_to_patches = _session->session_directory().midi_patch_path();
 
-	if (!exists(path_to_patches)) {
+	if (!exists (path_to_patches)) {
 		return;
 	}
 
@@ -68,9 +70,45 @@ MidiPatchManager::refresh()
 	Glib::PatternSpec pattern(string("*.midnam"));
 	vector<path> result;
 
-	find_matching_files_in_directory(path_to_patches, pattern, result);
+	find_matching_files_in_directory (path_to_patches, pattern, result);
+
+	info << "Loading " << result.size() << " MIDI patches from " << path_to_patches.to_string() << endmsg;
+
+	for (vector<path>::iterator i = result.begin(); i != result.end(); ++i) {
+		boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(i->to_string()));
+		for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
+					document->master_device_names_by_model().begin();
+				device != document->master_device_names_by_model().end();
+				++device) {
+			//cerr << "got model " << device->first << endl;
+			// have access to the documents by model name
+			_documents[device->first] = document;
+			// build a list of all master devices from all documents
+			_master_devices_by_model[device->first] = device->second;
+			_all_models.push_back(device->first);
+
+			// make sure there are no double model names
+			// TODO: handle this gracefully.
+			assert(_documents.count(device->first) == 1);
+			assert(_master_devices_by_model.count(device->first) == 1);
+		}
+	}
+}
+
+void
+MidiPatchManager::refresh()
+{
+	_documents.clear();
+	_master_devices_by_model.clear();
+	_all_models.clear();
+
+	SearchPath search_path = midi_patch_search_path ();
+	Glib::PatternSpec pattern (string("*.midnam"));
+	vector<path> result;
+
+	find_matching_files_in_search_path (search_path, pattern, result);
 
-	info << "Loading " << result.size() << " MIDI patches from " << path_to_patches.to_string() << endl;
+	info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
 
 	for (vector<path>::iterator i = result.begin(); i != result.end(); ++i) {
 		boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(i->to_string()));
@@ -91,6 +129,10 @@ MidiPatchManager::refresh()
 			assert(_master_devices_by_model.count(device->first) == 1);
 		}
 	}
+
+	if (_session) {
+		add_session_patches ();
+	}
 }
 
 void