X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=4b453b80bc0bbc0629e5ed0ace53abc91a97a046;hb=777fe3c68fef42d8fee79432830787bcebdfcb59;hp=d95296ef76aa803dd6b6a48e7fe5db29c8babc24;hpb=d155f32039570e9e0cde11b42e395ca2bcc89ffd;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index d95296ef76..4b453b80bc 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -21,15 +21,17 @@
 #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();
 
@@ -41,10 +43,14 @@ class MidiPort : public Port {
 	void cycle_end (pframes_t nframes);
 	void cycle_split ();
 
-	void flush_buffers (pframes_t nframes, framepos_t time);
+	void flush_buffers (pframes_t nframes);
 	void transport_stopped ();
+	void realtime_locate ();
+	void reset ();
+	void require_resolve ();
 
-	size_t raw_buffer_size (pframes_t nframes) const;
+	bool input_active() const { return _input_active; }
+	void set_input_active (bool yn);
 
 	Buffer& get_buffer (pframes_t nframes) {
 		return get_midi_buffer (nframes);
@@ -52,17 +58,33 @@ class MidiPort : public Port {
 
 	MidiBuffer& get_midi_buffer (pframes_t nframes);
 
+	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 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        _resolve_required;
+	bool        _input_active;
+	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