fix merge conflict with master

[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 e3f2673871fe2d296da808fc95a87853483c732e..01e890473692f444957d1ed92be87f42ba63b95e 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -118,11 +118,10 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 
        static void set_readahead_frames (framecnt_t frames_ahead) { midi_readahead = frames_ahead; }
 
-  protected:
-       int seek (framepos_t which_sample, bool complete_refill = false);
-
   protected:
        friend class MidiTrack;
+       friend class Auditioner;
+       int seek (framepos_t which_sample, bool complete_refill = false);
 
         int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_diskstream);
         frameoffset_t calculate_playback_distance (pframes_t nframes);