X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_patch_manager.h;h=f352009ba7ce731252fcdea814c9a000d69ae469;hb=ba0458cf1f6c69366e89631d8fff916ad183d768;hp=1642b1a22b0738295f93692cd6fc68dbed6c23d8;hpb=bf7e792e3e499b665c20fc196e53cf05bb99e0c7;p=ardour.git

diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h
index 1642b1a22b..f352009ba7 100644
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008 Hans Baier 
+    Copyright (C) 2008 Hans Baier
 
     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
@@ -21,7 +21,9 @@
 #ifndef MIDI_PATCH_MANAGER_H_
 #define MIDI_PATCH_MANAGER_H_
 
-#include <midi++/midnam_patch.h>
+#include "midi++/midnam_patch.h"
+#include "pbd/signals.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR {
 	class Session;
@@ -33,68 +35,108 @@ namespace MIDI
 namespace Name
 {
 
-class MidiPatchManager
+class MidiPatchManager : public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
 	/// Singleton
 private:
 	MidiPatchManager() {};
 	MidiPatchManager( const MidiPatchManager& );
 	MidiPatchManager& operator= (const MidiPatchManager&);
-	
-	static MidiPatchManager* _manager; 
-	
+
+	static MidiPatchManager* _manager;
+
 public:
 	typedef std::map<std::string, boost::shared_ptr<MIDINameDocument> > MidiNameDocuments;
-	
+
 	virtual ~MidiPatchManager() { _manager = 0; }
-	
-	static MidiPatchManager& instance() { 
+
+	static MidiPatchManager& instance() {
 		if (_manager == 0) {
 			_manager = new MidiPatchManager();
 		}
-		return *_manager; 
+		return *_manager;
 	}
-	
-	void set_session (ARDOUR::Session&);
-	
-	boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name) 
+
+	void set_session (ARDOUR::Session*);
+
+	boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name)
 		{ return _documents[model_name]; }
-	
-	boost::shared_ptr<MasterDeviceNames> master_device_by_model(std::string model_name) 
+
+	boost::shared_ptr<MasterDeviceNames> master_device_by_model(std::string model_name)
 		{ return _master_devices_by_model[model_name]; }
-	
-	boost::shared_ptr<Patch> find_patch(
-			string model, 
-			string custom_device_mode, 
-			uint8_t channel, 
-			PatchPrimaryKey patch_key) {
-		
+
+	boost::shared_ptr<ChannelNameSet> find_channel_name_set(
+			std::string model,
+			std::string custom_device_mode,
+			uint8_t channel) {
 		boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model);
-		
+
 		if (master_device != 0 && custom_device_mode != "") {
-			return master_device->
-			         channel_name_set_by_device_mode_and_channel(custom_device_mode, channel)->
-				        find_patch(patch_key);			
+			return master_device->channel_name_set_by_device_mode_and_channel(custom_device_mode, channel);
+		} else {
+			return boost::shared_ptr<ChannelNameSet>();
+		}
+	}
+
+	boost::shared_ptr<Patch> find_patch(
+			std::string model,
+			std::string custom_device_mode,
+			uint8_t channel,
+			PatchPrimaryKey patch_key) {
+
+		boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
+
+		if (channel_name_set) {
+			return  channel_name_set->find_patch(patch_key);
+		} else {
+			return boost::shared_ptr<Patch>();
+		}
+	}
+
+	boost::shared_ptr<Patch> previous_patch(
+			std::string model,
+			std::string custom_device_mode,
+			uint8_t channel,
+			PatchPrimaryKey patch_key) {
+
+		boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
+
+		if (channel_name_set) {
+			return  channel_name_set->previous_patch(patch_key);
+		} else {
+			return boost::shared_ptr<Patch>();
+		}
+	}
+
+	boost::shared_ptr<Patch> next_patch(
+			std::string model,
+			std::string custom_device_mode,
+			uint8_t channel,
+			PatchPrimaryKey patch_key) {
+
+		boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
+
+		if (channel_name_set) {
+			return  channel_name_set->next_patch(patch_key);
 		} else {
 			return boost::shared_ptr<Patch>();
 		}
 	}
-	
-	std::list<string> custom_device_mode_names_by_model(std::string model_name) {
+
+	std::list<std::string> custom_device_mode_names_by_model(std::string model_name) {
 		if (model_name != "") {
 			return master_device_by_model(model_name)->custom_device_mode_names();
 		} else {
-			return std::list<string>();
+			return std::list<std::string>();
 		}
 	}
-	
+
 	const MasterDeviceNames::Models& all_models() const { return _all_models; }
-	
+
 private:
-	void drop_session();
+	void session_going_away();
 	void refresh();
-	
-	ARDOUR::Session*                        _session;
+
 	MidiNameDocuments                       _documents;
 	MIDINameDocument::MasterDeviceNamesList _master_devices_by_model;
 	MasterDeviceNames::Models               _all_models;
@@ -103,4 +145,5 @@ private:
 } // namespace Name
 
 } // namespace MIDI
+
 #endif /* MIDI_PATCH_MANAGER_H_ */