fix another logic error in PresentationInfo::flag_match()

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

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 58b74bd54f16718ee40402a056643bea3fd2fa4d..45f01763d8a1ff7e5145ae68ab2ef1419272d1d2 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -66,11 +66,11 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
        float playback_buffer_load() const;
        float capture_buffer_load() const;
 
-       void get_playback (MidiBuffer& dst, framecnt_t);
        void flush_playback (framepos_t, framepos_t);
 
        void set_record_enabled (bool yn);
-       
+       void set_record_safe (bool yn);
+
        void reset_tracker ();
        void resolve_tracker (Evoral::EventSink<framepos_t>& buffer, framepos_t time);
 
@@ -127,23 +127,22 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
   protected:
        friend class MidiTrack;
        friend class Auditioner;
-       int seek (framepos_t which_sample, bool complete_refill = false);
 
+       int seek (framepos_t which_sample, bool complete_refill = false);
+       int _do_refill_with_alloc (bool one_chunk_only);
        int process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_diskstream);
-
        frameoffset_t calculate_playback_distance (pframes_t nframes);
        bool commit (framecnt_t nframes);
 
        static framecnt_t midi_readahead;
 
   private:
+       void get_playback (MidiBuffer& dst, framecnt_t);
 
        /* The two central butler operations */
        int do_flush (RunContext context, bool force = false);
        int do_refill ();
 
-       int do_refill_with_alloc();
-
        int read (framepos_t& start, framecnt_t cnt, bool reversed);
 
        void finish_capture ();
@@ -171,7 +170,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 
        bool prep_record_enable ();
        bool prep_record_disable ();
-    
+
        MidiRingBuffer<framepos_t>*  _playback_buf;
        MidiRingBuffer<framepos_t>*  _capture_buf;
        boost::weak_ptr<MidiPort>    _source_port;