X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=4b453b80bc0bbc0629e5ed0ace53abc91a97a046;hb=e6915e01de2e2167c3384c6c8f2408f763971616;hp=cc9fee1b15cc1ed07a0690196ade6906501e8490;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index cc9fee1b15..4b453b80bc 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -25,10 +25,10 @@
 
 #include "ardour/port.h"
 #include "ardour/midi_buffer.h"
-#include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
 
+class MidiBuffer;
 class MidiEngine;
 
 class LIBARDOUR_API MidiPort : public Port {
@@ -47,7 +47,7 @@ class LIBARDOUR_API 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);
@@ -58,35 +58,33 @@ class LIBARDOUR_API MidiPort : public Port {
 
 	MidiBuffer& get_midi_buffer (pframes_t nframes);
 
-        void set_always_parse (bool yn);
-        MIDI::Parser& self_parser() { return _self_parser; }
+	void set_trace (MIDI::Parser* trace_parser);
+
+	typedef boost::function<bool(MidiBuffer&,MidiBuffer&)> MidiFilter;
+	void set_inbound_filter (MidiFilter);
+	int add_shadow_port (std::string const &, MidiFilter);
+	boost::shared_ptr<MidiPort> shadow_port() const { return _shadow_port; }
+
+	void read_and_parse_entire_midi_buffer_with_no_speed_adjustment (pframes_t nframes, MIDI::Parser& parser, samplepos_t now);
 
   protected:
-        friend class PortManager;
+	friend class PortManager;
 
-        MidiPort (const std::string& name, PortFlags);
+	MidiPort (const std::string& name, PortFlags);
 
   private:
 	MidiBuffer* _buffer;
-	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);
+	MidiFilter   inbound_midi_filter;
+	boost::shared_ptr<MidiPort> _shadow_port;
+	MidiFilter   shadow_midi_filter;
+	MIDI::Parser* _trace_parser;
+	bool  _data_fetched_for_cycle;
+	
+	void resolve_notes (void* buffer, samplepos_t when);
+	void pull_input (pframes_t nframes, bool adjust_speed);
+	void parse_input (pframes_t nframes, MIDI::Parser& parser);
 };
 
 } // namespace ARDOUR