assert() to help find some possible causes of #2991. Fix some confusion with GTK...

[ardour.git] / libs / ardour / ardour / midi_port.h

diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 3c48f0ce9eb55dd562534a7a86038039f8aef876..10d8c7b6ca925f332afecf926d5361fdbffcc6c2 100644 (file)
--- 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,36 +31,40 @@ class MidiEngine;
 
 class MidiPort : public Port {
    public:
-       virtual ~MidiPort();
-       
-       DataType type() const { return DataType(DataType::MIDI); }
+       ~MidiPort();
 
-       MidiBuffer& get_buffer() {
-               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 (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);
        }
 
+       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);
+
+  private:
+       MidiBuffer* _buffer;
+       bool _has_been_mixed_down;
+       bool _resolve_in_process;
 
-       MidiBuffer*    _buffer;
-       jack_nframes_t _nframes_this_cycle;
+       MidiStateTracker _midi_state_tracker;
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_midi_port_h__ */