Fix a few framecnt / framepos type confusions.

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

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index bd3d223fc1eada1e2e4ac54c94c925f107db49ab..c5fd7b3af2ab3a25ad6087a81592ec3a147d05fc 100644 (file)
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -28,11 +28,11 @@
 namespace ARDOUR {
 
 struct SoundFileInfo {
-    float       samplerate;
-    uint16_t    channels;
-    int64_t     length;
-    std::string format_name;
-    int64_t     timecode;
+       float       samplerate;
+       uint16_t    channels;
+       int64_t     length;
+       std::string format_name;
+       int64_t     timecode;
 };
 
 class AudioFileSource : public AudioSource, public FileSource {
@@ -43,9 +43,9 @@ public:
                return (set_source_name(newname, destructive()) == 0);
        }
 
-        std::string peak_path (std::string audio_path);
-        std::string find_broken_peakfile (std::string missing_peak_path,
-                       std::string audio_path);
+       std::string peak_path (std::string audio_path);
+       std::string find_broken_peakfile (std::string missing_peak_path,
+                                         std::string audio_path);
 
        static void set_peak_dir (std::string dir) { peak_dir = dir; }
 
@@ -58,8 +58,8 @@ public:
        /* this block of methods do nothing for regular file sources, but are significant
           for files used in destructive recording.
        */
-       virtual sframes_t last_capture_start_frame() const { return 0; }
-       virtual void      mark_capture_start (sframes_t) {}
+       virtual framepos_t last_capture_start_frame() const { return 0; }
+       virtual void      mark_capture_start (framepos_t) {}
        virtual void      mark_capture_end () {}
        virtual void      clear_capture_marks() {}
        virtual bool      one_of_several_channels () const { return false; }
@@ -82,7 +82,7 @@ public:
        static bool is_empty (Session&, std::string path);
 
        static void set_bwf_serial_number (int);
-       static void set_header_position_offset (nframes_t offset );
+       static void set_header_position_offset (framecnt_t offset);
 
        static PBD::Signal0<void> HeaderPositionOffsetChanged;
 
@@ -91,7 +91,7 @@ protected:
        AudioFileSource (Session&, const std::string& path, Source::Flag flags);
 
        /** Constructor to be called for new in-session files */
-       AudioFileSource (Session&, const std::string& path, Source::Flag flags,
+       AudioFileSource (Session&, const std::string& path, const std::string& origin, Source::Flag flags,
                        SampleFormat samp_format, HeaderFormat hdr_format);
 
        /** Constructor to be called for existing in-session files */
@@ -104,7 +104,7 @@ protected:
 
        int move_dependents_to_trash();
 
-       static Sample* get_interleave_buffer (nframes_t size);
+       static Sample* get_interleave_buffer (framecnt_t size);
 
        static std::string peak_dir;
 
@@ -112,7 +112,8 @@ protected:
        static char bwf_organization_code[4];
        static char bwf_serial_number[13];
 
-       static uint64_t header_position_offset;
+       /** Kept up to date with the position of the session location start */
+       static framecnt_t header_position_offset;
 
   private:
        std::string old_peak_path (std::string audio_path);