X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=10d8c7b6ca925f332afecf926d5361fdbffcc6c2;hb=2b9dc7b380bb4e40171067f42b4010970869a57d;hp=1abfd809321a9423eb6389cbb2cb087e7181ff5a;hpb=bd1220a46db9fe909d09c08139cfb61ba98ec9f3;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 1abfd80932..10d8c7b6ca 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,40 @@ 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 (nframes_t nframes);
+	void cycle_end (nframes_t nframes);
+	void cycle_split ();
+
+	void flush_buffers (nframes_t nframes, nframes64_t time, nframes_t offset = 0);
+	void transport_stopped ();
+
+	size_t raw_buffer_size(jack_nframes_t nframes) const;
+
+	Buffer& get_buffer (nframes_t nframes, nframes_t offset = 0) {
+		return get_midi_buffer (nframes, offset);
 	}
-	
-	void cycle_start(jack_nframes_t nframes);
-	void cycle_end();
 
-	size_t capacity() { return _buffer.capacity(); }
-	size_t size()     { return _buffer.size(); }
+	MidiBuffer& get_midi_buffer (nframes_t nframes, nframes_t offset = 0);
 
   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;
-	jack_nframes_t _nframes_this_cycle;
+  private:
+	MidiBuffer* _buffer;
+	bool _has_been_mixed_down;
+	bool _resolve_in_process;
+
+	MidiStateTracker _midi_state_tracker;
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_midi_port_h__ */