X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Faudiofilesource.h;h=d91280284de7d766e94ff1444311a5f09c03a1dc;hb=f022784014d4ae1b3bb75a1c02f206ba8a28d7d6;hp=af5dabe38880fc3cf0abf871124fb74596a5b0c5;hpb=5f703f25a9c73912d2d28c29c52130e5f363c768;p=ardour.git

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index af5dabe388..d91280284d 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -27,7 +27,7 @@
 
 namespace ARDOUR {
 
-struct SoundFileInfo {
+struct LIBARDOUR_API SoundFileInfo {
 	float       samplerate;
 	uint16_t    channels;
 	int64_t     length;
@@ -35,21 +35,13 @@ struct SoundFileInfo {
 	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);
@@ -68,7 +60,7 @@ public:
 	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 ();
 
@@ -98,6 +90,12 @@ protected:
 	/** 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;
@@ -107,18 +105,12 @@ protected:
 
 	static Sample* get_interleave_buffer (framecnt_t size);
 
-	static std::string peak_dir;
-
 	static char bwf_country_code[3];
 	static char bwf_organization_code[4];
 	static char bwf_serial_number[13];
 
 	/** 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);
-	std::string broken_peak_path (std::string audio_path);
 };
 
 } // namespace ARDOUR