i/o button naming patch and imported file BWF timecode retention patch from nickm...

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

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 66544eec8cfff70f49303d671c4cea8d0d93255c..d3c6cdb85aacc1929014f64ff996e750145fe7d7 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -22,8 +22,8 @@
 
 #include <sndfile.h>
 
-#include <ardour/audiofilesource.h>
-#include <ardour/broadcast_info.h>
+#include "ardour/audiofilesource.h"
+#include "ardour/broadcast_info.h"
 
 namespace ARDOUR {
 
@@ -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 ();