X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=eb90dc1e35ef01ff9913ded6852b377efc579696;hb=7cc2e8c969e7b778af90f3b45a4c3fa3cbc90ef6;hp=5dc55398cb9c7fdb1441e3202488d534ee47a5f1;hpb=a8237f1aed3cd514cfa580aefad5a082bcdecb56;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 5dc55398cb..eb90dc1e35 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -21,15 +21,16 @@
 #ifndef __ardour_midi_port_h__
 #define __ardour_midi_port_h__
 
+#include "midi++/parser.h"
+
 #include "ardour/port.h"
-#include "ardour/midi_buffer.h"
-#include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
 
+class MidiBuffer;
 class MidiEngine;
 
-class MidiPort : public Port {
+class LIBARDOUR_API MidiPort : public Port {
    public:
 	~MidiPort();
 
@@ -45,29 +46,47 @@ class MidiPort : public Port {
 	void transport_stopped ();
 	void realtime_locate ();
 	void reset ();
-        void require_resolve ();
+	void require_resolve ();
 
 	bool input_active() const { return _input_active; }
 	void set_input_active (bool yn);
 
-	Buffer& get_buffer (pframes_t nframes) {
-		return get_midi_buffer (nframes);
-	}
+	Buffer& get_buffer (pframes_t nframes);
 
 	MidiBuffer& get_midi_buffer (pframes_t nframes);
 
+	void set_always_parse (bool yn);
+	void set_trace_on (bool yn);
+
+	MIDI::Parser& self_parser() { return _self_parser; }
+
   protected:
-	friend class AudioEngine;
+	friend class PortManager;
 
-	MidiPort (const std::string& name, Flags);
+	MidiPort (const std::string& name, PortFlags);
 
   private:
 	MidiBuffer* _buffer;
 	bool        _has_been_mixed_down;
 	bool        _resolve_required;
 	bool        _input_active;
-
-	void resolve_notes (void* jack_buffer, MidiBuffer::TimeType when);
+	bool        _always_parse;
+	bool        _trace_on;
+
+    /* Naming this is tricky. AsyncMIDIPort inherits (for now, aug 2013) from
+     * both MIDI::Port, which has _parser, and this (ARDOUR::MidiPort). We
+     * need parsing support in this object, independently of what the
+     * MIDI::Port/AsyncMIDIPort stuff does. Rather than risk errors coming
+     * from not explicitly naming which _parser we want, we will call this
+     * _self_parser for now.
+     *
+     * Ultimately, MIDI::Port should probably go away or be fully integrated
+     * into this object, somehow.
+     */
+
+	MIDI::Parser _self_parser;
+
+	void resolve_notes (void* buffer, framepos_t when);
 };
 
 } // namespace ARDOUR