remove reference "const int32_t&" -> const int32_t"

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

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 3aef9006306c4fa143c89de031cc8c2331ecc140..d91280284de7d766e94ff1444311a5f09c03a1dc 100644 (file)
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -27,29 +27,21 @@
 
 namespace ARDOUR {
 
-struct SoundFileInfo {
-    float       samplerate;
-    uint16_t    channels;
-    int64_t     length;
-    std::string format_name;
-    int64_t     timecode;
+struct LIBARDOUR_API SoundFileInfo {
+       float       samplerate;
+       uint16_t    channels;
+       int64_t     length;
+       std::string format_name;
+       int64_t     timecode;
 };
 
-class AudioFileSource : public AudioSource, public FileSource {
+class LIBARDOUR_API AudioFileSource : public AudioSource, public FileSource {
 public:
        virtual ~AudioFileSource ();
 
-       bool set_name (const std::string& newname) {
-               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);
-
-       static void set_peak_dir (std::string dir) { peak_dir = dir; }
+       std::string construct_peak_filepath (const std::string& audio_path, const bool in_session = false, const bool old_peak_name = false) const;
 
-       static bool get_soundfile_info (std::string path, SoundFileInfo& _info, std::string& error);
+       static bool get_soundfile_info (const std::string& path, SoundFileInfo& _info, std::string& error);
 
        bool safe_file_extension (const std::string& path) const {
                return safe_audio_file_extension(path);
@@ -58,16 +50,17 @@ 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; }
 
-       virtual int update_header (sframes_t when, struct tm&, time_t) = 0;
+       virtual void flush () = 0;
+       virtual int update_header (framepos_t when, struct tm&, time_t) = 0;
        virtual int flush_header () = 0;
 
-       void mark_streaming_write_completed ();
+       void mark_streaming_write_completed (const Lock& lock);
 
        int setup_peakfile ();
 
@@ -82,7 +75,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,12 +84,18 @@ 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 */
        AudioFileSource (Session&, const XMLNode&, bool must_exist = true);
 
+       /** Constructor to be called for crash recovery. Final argument is not
+        * used but exists to differentiate from the external-to-session
+        * constructor above.
+        */
+       AudioFileSource (Session&, const std::string& path, Source::Flag flags, bool);
+
        int init (const std::string& idstr, bool must_exist);
 
        virtual void set_header_timeline_position () = 0;
@@ -104,19 +103,14 @@ protected:
 
        int move_dependents_to_trash();
 
-       static Sample* get_interleave_buffer (nframes_t size);
-
-       static std::string peak_dir;
+       static Sample* get_interleave_buffer (framecnt_t size);
 
        static char bwf_country_code[3];
        static char bwf_organization_code[4];
        static char bwf_serial_number[13];
 
-       static uint64_t header_position_offset;
-
-  private:
-       std::string old_peak_path (std::string audio_path);
-       std::string broken_peak_path (std::string audio_path);
+       /** Kept up to date with the position of the session location start */
+       static framecnt_t header_position_offset;
 };
 
 } // namespace ARDOUR