diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-23 13:41:20 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-23 13:41:20 -0500 |
| commit | 7000afdc66c9e0ae8dcf9ec080517dabba1e7f34 (patch) | |
| tree | 19574ed8a1fbafa6bed222d8cf817ee1c8098314 /libs/ardour/ardour/midi_diskstream.h | |
| parent | 065e1e63342633f72725a5309926f71c87804293 (diff) | |
| parent | 40d8c5ae01f25e02457c554170a53d537246a7d4 (diff) | |
fix merge conflict with master
Diffstat (limited to 'libs/ardour/ardour/midi_diskstream.h')
| -rw-r--r-- | libs/ardour/ardour/midi_diskstream.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index e3f2673871..01e8904736 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -119,10 +119,9 @@ 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); |