lots more work trying to create a common structure for accessing plugin and MIDNAME patch/preset/program names. still not done

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

1 files changed, 6 insertions, 6 deletions

diff --git a/gtk2_ardour/canvas_patch_change.h b/gtk2_ardour/canvas_patch_change.h
index 2a219fdbb6..20c0067ae7 100644
--- a/gtk2_ardour/canvas_patch_change.h
+++ b/gtk2_ardour/canvas_patch_change.h
@@ -30,6 +30,10 @@ namespace MIDI {
 	}
 }
 
+namespace ARDOUR {
+	class InstrumentInfo;
+}
+
 namespace Gnome {
 namespace Canvas {
 
@@ -43,8 +47,7 @@ public:
 		double          height,
 		double          x,
 		double          y,
-		string&         model_name,
-		string&         custom_device_mode,
+		ARDOUR::InstrumentInfo& info,
 		ARDOUR::MidiModel::PatchChangePtr patch,
 		bool
 		);
@@ -53,8 +56,6 @@ public:
 
 	virtual bool on_event(GdkEvent* ev);
 
-	string model_name () const { return _model_name; }
-	string custom_device_mode () const { return _custom_device_mode; }
 	ARDOUR::MidiModel::PatchChangePtr patch () const { return _patch; }
 
 	void initialize_popup_menus();
@@ -62,8 +63,7 @@ public:
 	void on_patch_menu_selected(const MIDI::Name::PatchPrimaryKey& key);
 
 private:
-	string        _model_name;
-	string        _custom_device_mode;
+        ARDOUR::InstrumentInfo& _info;
 	ARDOUR::MidiModel::PatchChangePtr _patch;
 	Gtk::Menu     _popup;
 	bool          _popup_initialized;