Commit read-only stack security fix for 64bit processors.

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

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 5e3c1f621d7028ba13a6a03edf549ee4bb43678e..50fd5e68393af1685a2263d547bb729a0299c7ca 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -31,11 +31,11 @@ class SndFileSource : public AudioFileSource {
   public:
        /* constructor to be called for existing external-to-session files */
 
-       SndFileSource (std::string path, Flag flags);
+       SndFileSource (Session&, std::string path, Flag flags);
 
        /* constructor to be called for new in-session files */
 
-       SndFileSource (std::string path, SampleFormat samp_format, HeaderFormat hdr_format, jack_nframes_t rate, 
+       SndFileSource (Session&, std::string path, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, 
                       Flag flags = AudioFileSource::Flag (AudioFileSource::Writable|
                                                           AudioFileSource::Removable|
                                                           AudioFileSource::RemovableIfEmpty|
@@ -43,23 +43,23 @@ class SndFileSource : public AudioFileSource {
                       
        /* constructor to be called for existing in-session files */
        
-       SndFileSource (const XMLNode&);
+       SndFileSource (Session&, const XMLNode&);
 
        ~SndFileSource ();
 
        float sample_rate () const;
-       int update_header (jack_nframes_t when, struct tm&, time_t);
+       int update_header (nframes_t when, struct tm&, time_t);
        int flush_header ();
 
-       void handle_smpte_offset_change (jack_nframes_t offset, bool negative);
+       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);
+       nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const;
+       nframes_t write_unlocked (Sample *dst, nframes_t cnt);
 
-       jack_nframes_t write_float (Sample* data, jack_nframes_t pos, jack_nframes_t cnt);
+       nframes_t write_float (Sample* data, nframes_t pos, nframes_t cnt);
 
   private:
        SNDFILE *sf;
@@ -67,15 +67,15 @@ class SndFileSource : public AudioFileSource {
        SF_BROADCAST_INFO *_broadcast_info;
 
        mutable float *interleave_buf;
-       mutable jack_nframes_t interleave_bufsize;
+       mutable nframes_t interleave_bufsize;
 
        void init (const string &str);
        int open();
        void close();
-       int setup_broadcast_info (jack_nframes_t when, struct tm&, time_t);
+       int setup_broadcast_info (nframes_t when, struct tm&, time_t);
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __sndfile_source_h__ */