From 4e6d0c9e61b62931a4a2120b548f0ff02a966351 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 20 Jan 2013 08:56:00 +0000
Subject: Show matching controller name in automation lane header. Completely
 eliminate static MIDI controller name code. Reduce dependency on
 midnam_patch.h (which would have saved me several hours if I did it earlier).
 Store controller name numbers as an integer. Keep controller names in a map
 keyed by int instead of a list for fast lookup. More cleanup of MIDI::Name
 code.

git-svn-id: svn://localhost/ardour2/branches/3.0@13927 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/instrument_info.h | 17 +++++++++++++----
 libs/ardour/ardour/midi_track.h      | 20 +++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

(limited to 'libs/ardour/ardour')

diff --git a/libs/ardour/ardour/instrument_info.h b/libs/ardour/ardour/instrument_info.h
index f83b2c0632..8691db24e5 100644
--- a/libs/ardour/ardour/instrument_info.h
+++ b/libs/ardour/ardour/instrument_info.h
@@ -22,11 +22,19 @@
 #include <string>
 #include <stdint.h>
 
+#include <boost/weak_ptr.hpp>
+
 #include "pbd/signals.h"
 
-#include "midi++/midnam_patch.h"
+#include "evoral/Parameter.hpp"
 
-#include <boost/weak_ptr.hpp>
+namespace MIDI {
+namespace Name {
+class ChannelNameSet;
+class Patch;
+typedef std::list<boost::shared_ptr<Patch> > PatchNameList;
+}
+}
 
 namespace ARDOUR {
 
@@ -41,13 +49,14 @@ class InstrumentInfo {
     void set_internal_instrument (boost::shared_ptr<ARDOUR::Processor>);
 
     std::string get_patch_name (uint16_t bank, uint8_t program, uint8_t channel) const;
+    std::string get_controller_name (Evoral::Parameter param) const;
     std::string get_instrument_name () const;
 
     boost::shared_ptr<MIDI::Name::ChannelNameSet> get_patches (uint8_t channel);
 
     PBD::Signal0<void> Changed;
 
-    static const MIDI::Name::PatchBank::PatchNameList& general_midi_patches();
+    static const MIDI::Name::PatchNameList& general_midi_patches();
 
   private:
     std::string external_instrument_model;
@@ -58,7 +67,7 @@ class InstrumentInfo {
     boost::shared_ptr<MIDI::Name::ChannelNameSet> plugin_programs_to_channel_name_set (boost::shared_ptr<Processor> p);
     std::string get_plugin_patch_name (boost::shared_ptr<ARDOUR::Processor>, uint16_t bank, uint8_t program, uint8_t channel) const;
 
-    static MIDI::Name::PatchBank::PatchNameList _gm_patches;
+    static MIDI::Name::PatchNameList _gm_patches;
 };
 
 } /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index cf7167e3af..c5f3bb977b 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -60,10 +60,18 @@ public:
 
 	bool bounceable (boost::shared_ptr<Processor>, bool) const { return false; }
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
-	boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, 
-						boost::shared_ptr<Processor> endpoint, bool include_endpoint);
-	int export_stuff (BufferSet& bufs, framepos_t start_frame, framecnt_t end_frame, 
-			  boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export);
+	boost::shared_ptr<Region> bounce_range (framepos_t                   start,
+	                                        framepos_t                   end,
+	                                        InterThreadInfo&             iti,
+	                                        boost::shared_ptr<Processor> endpoint,
+	                                        bool                         include_endpoint);
+
+	int export_stuff (BufferSet&                   bufs,
+	                  framepos_t                   start_frame,
+	                  framecnt_t                   end_frame,
+	                  boost::shared_ptr<Processor> endpoint,
+	                  bool                         include_endpoint,
+	                  bool                         for_export);
 
 	int set_state (const XMLNode&, int version);
 
@@ -86,6 +94,8 @@ public:
 	NoteMode note_mode() const { return _note_mode; }
 	void set_note_mode (NoteMode m);
 
+	std::string describe_parameter (Evoral::Parameter param);
+
 	bool step_editing() const { return _step_editing; }
 	void set_step_editing (bool yn);
 	MidiRingBuffer<framepos_t>& step_edit_ring_buffer() { return _step_edit_ring_buffer; }
@@ -102,7 +112,7 @@ public:
 	boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const;
 
 	void set_monitoring (MonitorChoice);
-        MonitorState monitoring_state () const;
+	MonitorState monitoring_state () const;
 
 	void set_input_active (bool);
 	bool input_active () const;
-- 
cgit v1.2.3