X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=cc9fee1b15cc1ed07a0690196ade6906501e8490;hb=c4a7d25b34aec71ab7d594af50f7b522518e0221;hp=8b6095c47075355849badb5eaf6cbd6e8907d134;hpb=ede4ecbb00ecc866c502454c81e711baea780ccd;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 8b6095c470..cc9fee1b15 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -21,6 +21,8 @@
 #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"
@@ -29,7 +31,7 @@ namespace ARDOUR {
 
 class MidiEngine;
 
-class MidiPort : public Port {
+class LIBARDOUR_API MidiPort : public Port {
    public:
 	~MidiPort();
 
@@ -37,32 +39,54 @@ class MidiPort : public Port {
 		return DataType::MIDI;
 	}
 
-	void cycle_start (nframes_t nframes);
-	void cycle_end (nframes_t nframes);
+	void cycle_start (pframes_t nframes);
+	void cycle_end (pframes_t nframes);
 	void cycle_split ();
 
-	void flush_buffers (nframes_t nframes, framepos_t time, nframes_t offset = 0);
+	void flush_buffers (pframes_t nframes);
 	void transport_stopped ();
+	void realtime_locate ();
+	void reset ();
+        void require_resolve ();
 
-	size_t raw_buffer_size(jack_nframes_t nframes) const;
+	bool input_active() const { return _input_active; }
+	void set_input_active (bool yn);
 
-	Buffer& get_buffer (nframes_t nframes, nframes_t offset = 0) {
-		return get_midi_buffer (nframes, offset);
+	Buffer& get_buffer (pframes_t nframes) {
+		return get_midi_buffer (nframes);
 	}
 
-	MidiBuffer& get_midi_buffer (nframes_t nframes, nframes_t offset = 0);
+	MidiBuffer& get_midi_buffer (pframes_t nframes);
+
+        void set_always_parse (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_in_process;
-
-	MidiStateTracker _midi_state_tracker;
+	bool        _has_been_mixed_down;
+	bool        _resolve_required;
+	bool        _input_active;
+        bool        _always_parse;
+
+    /* 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, MidiBuffer::TimeType when);
 };
 
 } // namespace ARDOUR