make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

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

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 6c4e61d5696cad6be21043f81950d05085eabbaa..7983b2e340f1d5b44bc7ecec9e8fda223941ad07 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 
 */
 
-#ifndef __sndfile_source_h__ 
+#ifndef __sndfile_source_h__
 #define __sndfile_source_h__
 
 #include <sndfile.h>
@@ -34,9 +34,9 @@ class SndFileSource : public AudioFileSource {
 
        /* Constructor to be called for new in-session files */
        SndFileSource (Session&, const Glib::ustring& path, bool embedded,
-                       SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, 
+                       SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate,
                        Flag flags = SndFileSource::default_writable_flags);
-                      
+
        /** Constructor to be called for existing in-session files */
        SndFileSource (Session&, const XMLNode&);
 
@@ -46,7 +46,7 @@ class SndFileSource : public AudioFileSource {
        int update_header (sframes_t when, struct tm&, time_t);
        int flush_header ();
 
-       sframes_t natural_position () const;
+       nframes64_t natural_position () const;
 
        sframes_t last_capture_start_frame() const;
        void mark_capture_start (sframes_t);
@@ -57,10 +57,10 @@ class SndFileSource : public AudioFileSource {
 
        bool one_of_several_channels () const;
 
-       static void setup_standard_crossfades (nframes_t sample_rate);
+       static void setup_standard_crossfades (Session const &, nframes_t sample_rate);
        static const Source::Flag default_writable_flags;
 
-       static int get_soundfile_info (const Glib::ustring& path, SoundFileInfo& _info, string& error_msg);
+       static int get_soundfile_info (const Glib::ustring& path, SoundFileInfo& _info, std::string& error_msg);
 
   protected:
        void set_header_timeline_position ();