dramatic change in logic and naming for operations related to adding a MIDI region...

[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 f27789da5f7e14dfbbea57e899bed1545f30757c..00617d90ecb5d5d146b6d98a00b31284a3d0cdd1 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,8 +21,11 @@
 #ifndef __ardour_midi_port_h__
 #define __ardour_midi_port_h__
 
+#include "midi++/parser.h"
+
 #include "ardour/port.h"
 #include "ardour/midi_buffer.h"
+#include "ardour/midi_state_tracker.h"
 
 namespace ARDOUR {
 
@@ -36,27 +39,56 @@ class MidiPort : public Port {
                return DataType::MIDI;
        }
 
-       void cycle_start (nframes_t nframes, nframes_t offset);
-       void cycle_end (nframes_t nframes, nframes_t offset);
-       void flush_buffers (nframes_t nframes, nframes_t 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 ();
 
-       Buffer& get_buffer (nframes_t nframes, nframes_t offset) {
-               return get_midi_buffer (nframes, offset);
+       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 (nframes_t nframes, nframes_t offset);
+
+       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, Flags);
-  
-  private:
+        MidiPort (const std::string& name, PortFlags);
 
+  private:
        MidiBuffer* _buffer;
-       bool _has_been_mixed_down;
+       bool        _has_been_mixed_down;
+       bool        _resolve_required;
+       bool        _input_active;
+        bool        _always_parse;
+
+    /* 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, MidiBuffer::TimeType when);
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_midi_port_h__ */