X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=a4d2f538067385ad721b52dd068069ce1f10b906;hb=18bc80a01c7154569f49d4c33b92e5753b65b438;hp=f2b734a903d032f777c78ab49bf262feb30242f3;hpb=a8da89d745c6a7e7d4c20dfcfb16b2537d767428;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index f2b734a903..a4d2f53806 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,13 +21,9 @@
 #ifndef __ardour_midi_port_h__
 #define __ardour_midi_port_h__
 
-#include <sigc++/signal.h>
-#include <pbd/failed_constructor.h>
-#include <ardour/ardour.h>
-#include <jack/jack.h>
-#include <jack/midiport.h>
-#include <ardour/port.h>
-#include <ardour/buffer.h>
+#include "ardour/port.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
 
@@ -35,35 +31,44 @@ class MidiEngine;
 
 class MidiPort : public Port {
    public:
-	virtual ~MidiPort();
-	
-	DataType type() const { return DataType(DataType::MIDI); }
+	~MidiPort();
 
-	Buffer& get_buffer() {
-		return _buffer;
+	DataType type () const {
+		return DataType::MIDI;
 	}
 
-	MidiBuffer& get_midi_buffer() {
-		return _buffer;
+	void cycle_start (pframes_t nframes);
+	void cycle_end (pframes_t nframes);
+	void cycle_split ();
+
+	void flush_buffers (pframes_t nframes, framepos_t time);
+	void transport_stopped ();
+	void realtime_locate ();
+	void reset ();
+
+	bool input_active() const { return _input_active; }
+	void set_input_active (bool yn);
+
+	Buffer& get_buffer (pframes_t nframes) {
+		return get_midi_buffer (nframes);
 	}
-	
-	void cycle_start(nframes_t nframes);
-	void cycle_end();
 
-	size_t capacity() { return _buffer.capacity(); }
-	size_t size()     { return _buffer.size(); }
+	MidiBuffer& get_midi_buffer (pframes_t nframes);
 
   protected:
 	friend class AudioEngine;
 
-	MidiPort (jack_port_t *port);
-	
-	/* engine isn't supposed to access below here */
+	MidiPort (const std::string& name, Flags);
 
-	MidiBuffer     _buffer;
-	nframes_t _nframes_this_cycle;
+  private:
+	MidiBuffer* _buffer;
+	bool        _has_been_mixed_down;
+	bool        _resolve_required;
+	bool        _input_active;
+
+	void resolve_notes (void* jack_buffer, MidiBuffer::TimeType when);
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_midi_port_h__ */