tentative fix for losing (empty) MIDI files. Incomplete because testing shows issues...

[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 4a9a2ededc165c709e707da8528f4e851ddfd02b..cc9fee1b15cc1ed07a0690196ade6906501e8490 100644 (file)
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -21,6 +21,8 @@
 #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"
@@ -29,7 +31,7 @@ namespace ARDOUR {
 
 class MidiEngine;
 
-class MidiPort : public Port {
+class LIBARDOUR_API MidiPort : public Port {
    public:
        ~MidiPort();
 
@@ -56,18 +58,35 @@ class MidiPort : public Port {
 
        MidiBuffer& get_midi_buffer (pframes_t nframes);
 
+        void set_always_parse (bool yn);
+        MIDI::Parser& self_parser() { return _self_parser; }
+
   protected:
-    friend class PortManager;
+        friend class PortManager;
 
-    MidiPort (const std::string& name, PortFlags);
+        MidiPort (const std::string& name, PortFlags);
 
   private:
        MidiBuffer* _buffer;
        bool        _has_been_mixed_down;
        bool        _resolve_required;
        bool        _input_active;
-
-       void resolve_notes (void* jack_buffer, MidiBuffer::TimeType when);
+        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