merge from trunk

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

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 5e3c1f621d7028ba13a6a03edf549ee4bb43678e..ab3e61eb2963f470d072f3cce83101d2b7fd7326 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -51,13 +51,13 @@ class SndFileSource : public AudioFileSource {
        int update_header (jack_nframes_t when, struct tm&, time_t);
        int flush_header ();
 
-       void handle_smpte_offset_change (jack_nframes_t offset, bool negative);
+       jack_nframes_t natural_position () const;
 
   protected:
        void set_header_timeline_position ();
 
-       jack_nframes_t read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const;
-       jack_nframes_t write_unlocked (Sample *dst, jack_nframes_t cnt, char * workbuf);
+       jack_nframes_t read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt) const;
+       jack_nframes_t write_unlocked (Sample *dst, jack_nframes_t cnt);
 
        jack_nframes_t write_float (Sample* data, jack_nframes_t pos, jack_nframes_t cnt);
 
@@ -75,7 +75,7 @@ class SndFileSource : public AudioFileSource {
        int setup_broadcast_info (jack_nframes_t when, struct tm&, time_t);
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __sndfile_source_h__ */