X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_port.h;h=cc9fee1b15cc1ed07a0690196ade6906501e8490;hb=c4a7d25b34aec71ab7d594af50f7b522518e0221;hp=a2bc259a6e529cdf5807cae85d044dab6c09ea78;hpb=30ab1fd61569f9d7fb7410d483fa68cbf9865c37;p=ardour.git

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index a2bc259a6e..cc9fee1b15 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,51 +21,74 @@
 #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 "midi++/parser.h"
+
+#include "ardour/port.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
 
 class MidiEngine;
 
-class MidiPort : public Port {
+class LIBARDOUR_API MidiPort : public Port {
    public:
-	virtual ~MidiPort();
-	
-	DataType type() const { return DataType(DataType::MIDI); }
+	~MidiPort();
 
-	MidiBuffer& get_buffer() {
-		assert(_nframes_this_cycle > 0);
-		return *_buffer;
+	DataType type () const {
+		return DataType::MIDI;
 	}
-	
-	void cycle_start(jack_nframes_t nframes);
-	void cycle_end();
-
-	size_t capacity() { return _buffer->capacity(); }
-	size_t size()     { return _buffer->size(); }
-	
-	/** Assumes that the port is an output port */
-	void silence (jack_nframes_t nframes, jack_nframes_t offset) {
-		_buffer->silence(nframes, offset);
+
+	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) {
+		return get_midi_buffer (nframes);
 	}
 
+	MidiBuffer& get_midi_buffer (pframes_t nframes);
+
+        void set_always_parse (bool yn);
+        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;
 
-	MidiPort (jack_port_t *port);
-	
-	/* engine isn't supposed to access below here */
+    /* 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.
+     */
 
-	MidiBuffer*    _buffer;
-	jack_nframes_t _nframes_this_cycle;
+        MIDI::Parser _self_parser;
+
+	void resolve_notes (void* buffer, MidiBuffer::TimeType when);
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_midi_port_h__ */