Fixed incomplete merge for audioengine.cc

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

diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h
index 15e4d2689bafe9134a760779090e9121fecf066c..652f1c49cfa22a89d6a53166cd64090071ad7df6 100644 (file)
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -49,12 +49,14 @@ public:
        inline bool read_contents(uint32_t size, uint8_t* buf);
 
        size_t read(MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset=0, bool stop_on_overflow_in_destination=false);
+       size_t skip_to(framepos_t start);
 
        void dump(std::ostream& dst);
        void flush (framepos_t start, framepos_t end);
 
        void reset_tracker ();
-       void loop_resolve (MidiBuffer& dst, framepos_t);
+       void resolve_tracker (MidiBuffer& dst, framepos_t);
+       void resolve_tracker (Evoral::EventSink<framepos_t>& dst, framepos_t);
 
 private:
        MidiStateTracker _tracker;