X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_patch_manager.h;h=5eb34dbbf4047c91754ce1028310809c5e00dab9;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=5ed648b3e7d52d10da48d42070ef9861d8af923d;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git

diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h
index 5ed648b3e7..5eb34dbbf4 100644
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -22,12 +22,11 @@
 #define MIDI_PATCH_MANAGER_H_
 
 #include "midi++/midnam_patch.h"
+
 #include "pbd/signals.h"
-#include "ardour/session_handle.h"
+#include "pbd/search_path.h"
 
-namespace ARDOUR {
-	class Session;
-}
+#include "ardour/libardour_visibility.h"
 
 namespace MIDI
 {
@@ -35,7 +34,7 @@ namespace MIDI
 namespace Name
 {
 
-class LIBARDOUR_API MidiPatchManager : public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
+class LIBARDOUR_API MidiPatchManager
 {
 	/// Singleton
 private:
@@ -58,10 +57,17 @@ public:
 		return *_manager;
 	}
 
-	void set_session (ARDOUR::Session*);
+	PBD::Signal0<void> PatchesChanged;
+
+	bool add_custom_midnam (const std::string& id, const std::string& midnam);
+	bool update_custom_midnam (const std::string& id, const std::string& midnam);
+	bool remove_custom_midnam (const std::string& id);
+
+	void add_search_path (const PBD::Searchpath& search_path);
+
+	void remove_search_path (const PBD::Searchpath& search_path);
 
-	boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name)
-		{ return _documents[model_name]; }
+	boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name) const;
 
 	boost::shared_ptr<MasterDeviceNames> master_device_by_model(std::string model_name)
 		{ return _master_devices_by_model[model_name]; }
@@ -138,9 +144,15 @@ public:
 	const DeviceNamesByMaker& devices_by_manufacturer() const { return _devices_by_manufacturer; }
 
 private:
-	void session_going_away();
-	void refresh();
-	void add_session_patches();
+	bool load_midi_name_document(const std::string& file_path);
+	bool add_midi_name_document(boost::shared_ptr<MIDINameDocument>);
+	bool remove_midi_name_document(const std::string& file_path, bool emit_signal = true);
+
+	void add_midnam_files_from_directory(const std::string& directory_path);
+	void remove_midnam_files_from_directory(const std::string& directory_path);
+
+private:
+	PBD::Searchpath                         _search_path;
 
 	MidiNameDocuments                       _documents;
 	MIDINameDocument::MasterDeviceNamesList _master_devices_by_model;