* removed old implementation for Program Changes from MidiModel

* Added Automation based implementation for Program Changes, Pitch Bender and Channel Aftertouch

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

1 files changed, 2 insertions, 8 deletions

diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index 7e5b6aac72..5f58b29ad8 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -32,13 +32,13 @@
 #include <ardour/midi_ring_buffer.h>
 #include <ardour/automatable.h>
 #include <ardour/note.h>
+#include <ardour/types.h>
 
 namespace ARDOUR {
 
 class Session;
 class MidiSource;
 	
-//                                                                     x   ,  y
 class MidiControlIterator {
 public:
 	boost::shared_ptr<const AutomationList> automation_list;
@@ -110,10 +110,6 @@ public:
 	inline       Notes& notes()       { return _notes; }
 	inline const Notes& notes() const { return _notes; }
 
-	typedef std::vector< boost::shared_ptr<MIDI::Event> > PgmChanges;
-	inline       PgmChanges& pgm_changes()       { return _pgm_changes; }
-	inline const PgmChanges& pgm_changes() const { return _pgm_changes; }
-
 	/** Add/Remove notes.
 	 * Technically all operations can be implemented as one of these.
 	 */
@@ -195,7 +191,6 @@ public:
 		Notes::const_iterator                      _note_iter;
 		std::vector<MidiControlIterator>           _control_iters;
 		std::vector<MidiControlIterator>::iterator _control_iter;
-		PgmChanges::const_iterator                 _pgm_change_iter;
 	};
 	
 	const_iterator        begin() const { return const_iterator(*this, 0); }
@@ -218,13 +213,12 @@ private:
 
 	void append_note_on_unlocked(uint8_t chan, double time, uint8_t note, uint8_t velocity);
 	void append_note_off_unlocked(uint8_t chan, double time, uint8_t note);
-	void append_cc_unlocked(uint8_t chan, double time, uint8_t number, uint8_t value);
+	void append_automation_event_unlocked(AutomationType type, uint8_t chan, double time, uint8_t first_byte, uint8_t second_byte);
 	void append_pgm_change_unlocked(uint8_t chan, double time, uint8_t number); 
 
 	mutable Glib::RWLock _lock;
 
 	Notes      _notes;
-	PgmChanges _pgm_changes;
 	
 	NoteMode _note_mode;