X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=3856d11ac5674132aabe1db45eed6db9fef5617f;hb=8f8e32881cccf4e5aecbb8f9a7751414ff4e2d78;hp=485834aaffb0d7d7dc0c6ab47af88e72e1174e41;hpb=c78c44ccd7bb5ce4903385b1c18613160fbb61bf;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 485834aaff..3856d11ac5 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,27 +21,82 @@
 #ifndef __ardour_midi_port_h__
 #define __ardour_midi_port_h__
 
-#include <ardour/base_midi_port.h>
+#include "midi++/parser.h"
+
+#include "ardour/port.h"
 
 namespace ARDOUR {
 
+class MidiBuffer;
 class MidiEngine;
 
-class MidiPort : public BaseMidiPort, public PortFacade {
+class LIBARDOUR_API MidiPort : public Port {
    public:
 	~MidiPort();
 
+	DataType type () const {
+		return DataType::MIDI;
+	}
+
+	void cycle_start (pframes_t nframes);
+	void cycle_end (pframes_t nframes);
+	void cycle_split ();
+
+	void flush_buffers (pframes_t nframes);
+	void transport_stopped ();
+	void realtime_locate ();
 	void reset ();
+	void require_resolve ();
+
+	bool input_active() const { return _input_active; }
+	void set_input_active (bool yn);
+
+	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);
 
-	void cycle_start (nframes_t nframes, nframes_t offset);
-	void cycle_end (nframes_t nframes, nframes_t offset);
+	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; }
+
+	MIDI::Parser& self_parser() { return _self_parser; }
 
   protected:
-	friend class AudioEngine;
+	friend class PortManager;
+
+	MidiPort (const std::string& name, PortFlags);
+
+  private:
+	MidiBuffer* _buffer;
+	bool        _has_been_mixed_down;
+	bool        _resolve_required;
+	bool        _input_active;
+	bool        _always_parse;
+	bool        _trace_on;
+	MidiFilter   inbound_midi_filter;
+	boost::shared_ptr<MidiPort> _shadow_port;
+	MidiFilter   shadow_midi_filter;
 
-	MidiPort (const std::string& name, Flags, bool external, nframes_t bufsize);
+	/* 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
 
 #endif /* __ardour_midi_port_h__ */