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

2 files changed, 41 insertions, 1 deletions

diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h
index f352009ba7..32b3ebc61d 100644
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -39,7 +39,7 @@ class MidiPatchManager : public PBD::ScopedConnectionList, public ARDOUR::Sessio
 {
 	/// Singleton
 private:
-	MidiPatchManager() {};
+	MidiPatchManager();
 	MidiPatchManager( const MidiPatchManager& );
 	MidiPatchManager& operator= (const MidiPatchManager&);
 
@@ -136,6 +136,7 @@ public:
 private:
 	void session_going_away();
 	void refresh();
+	void add_session_patches();
 
 	MidiNameDocuments                       _documents;
 	MIDINameDocument::MasterDeviceNamesList _master_devices_by_model;
diff --git a/libs/ardour/ardour/midi_patch_search_path.h b/libs/ardour/ardour/midi_patch_search_path.h
new file mode 100644
index 0000000000..5d27823461
--- /dev/null
+++ b/libs/ardour/ardour/midi_patch_search_path.h
@@ -0,0 +1,39 @@
+/*
+    Copyright (C) 2011 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __ardour_midi_patch_search_path_h__
+#define __ardour_midi_patch_search_path_h__
+
+#include "pbd/search_path.h"
+
+namespace ARDOUR {
+
+	/**
+	 * return a SearchPath containing directories in which to look for
+	 * MIDI patch files ("*.midnam") aka MIDNAM files
+	 *
+	 * If ARDOUR_MIDI_PATCH_PATH is defined then the SearchPath returned
+	 * will contain only those directories specified in it, otherwise it will
+	 * contain the user and system directories which may contain control
+	 * surface plugins.
+	 */
+	PBD::SearchPath midi_patch_search_path ();
+
+} // namespace ARDOUR
+
+#endif /* __ardour_midi_patch_search_path_h__ */