X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=bb3c18f810470ed3b33853da73b2dece1d0ba686;hb=489753e866eba93e1263f61b716c31ca80a32181;hp=6c9a07fc900fde11297d24f62c910ccd23d6d7e7;hpb=f89a976f1a0477fba30bd7117310e6d04b370d68;p=ardour.git

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 6c9a07fc90..bb3c18f810 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include "pbd/gstdio_compat.h"
 #include "pbd/convert.h"
 #include "pbd/basename.h"
 #include "pbd/file_utils.h"
@@ -42,11 +43,9 @@
 
 #include <sndfile.h>
 
-#include <glib/gstdio.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/threads.h>
-#include <glibmm/convert.h>
 
 #include "ardour/audiofilesource.h"
 #include "ardour/debug.h"
@@ -69,8 +68,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
 
-string AudioFileSource::peak_dir = "";
-
 PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
 framecnt_t         AudioFileSource::header_position_offset = 0;
 
@@ -154,7 +151,7 @@ AudioFileSource::~AudioFileSource ()
 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("AudioFileSource destructor %1, removable? %2\n", _path, removable()));
 	if (removable()) {
 		::g_unlink (_path.c_str());
-		::g_unlink (peakpath.c_str());
+		::g_unlink (_peakpath.c_str());
 	}
 }
 
@@ -165,107 +162,21 @@ AudioFileSource::init (const string& pathstr, bool must_exist)
 }
 
 string
-AudioFileSource::peak_path (string audio_path)
+AudioFileSource::construct_peak_filepath (const string& audio_path, const bool in_session, const bool old_peak_name) const
 {
 	string base;
-
-	string::size_type suffix = audio_path.find_last_of ('.');
-
-	if (suffix != string::npos) {
-		base = audio_path.substr (0, suffix);
+	if (old_peak_name) {
+		base = audio_path.substr (0, audio_path.find_last_of ('.'));
 	} else {
-		warning << string_compose (_("Odd audio file path: %1"), Glib::locale_from_utf8(audio_path)) << endmsg;
 		base = audio_path;
 	}
-
 	base += '%';
 	base += (char) ('A' + _channel);
-
-	/* pass in the name/path of the source, with no audio file type suffix
-	 */
-	
-	return _session.peak_path (base);
-}
-
-string
-AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
-{
-	string str;
-
-	/* check for the broken location in use by 2.0 for several months */
-
-	str = broken_peak_path (audio_path);
-
-	if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
-
-		if (!within_session()) {
-
-			/* it would be nice to rename it but the nature of
-			   the bug means that we can't reliably use it.
-			*/
-
-			peak_path = str;
-
-		} else {
-			/* all native files are mono, so we can just rename
-			   it.
-			*/
-			::rename (str.c_str(), peak_path.c_str());
-		}
-
-	} else {
-		/* Nasty band-aid for older sessions that were created before we
-		   used libsndfile for all audio files.
-		*/
-#ifndef PLATFORM_WINDOWS // there's no old_peak_path() for windows
-		str = old_peak_path (audio_path);
-		if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
-			peak_path = str;
-		}
-#endif
-	}
-
-	return peak_path;
-}
-
-string
-AudioFileSource::broken_peak_path (string audio_path)
-{
-	return _session.peak_path (basename_nosuffix (audio_path));
-}
-
-string
-AudioFileSource::old_peak_path (string audio_path)
-{
-	/* XXX hardly bombproof! fix me */
-
-	struct stat stat_file;
-	struct stat stat_mount;
-
-	string mp = mountpoint (audio_path);
-
-	stat (audio_path.c_str(), &stat_file);
-	stat (mp.c_str(), &stat_mount);
-
-	char buf[32];
-#ifdef __APPLE__
-	snprintf (buf, sizeof (buf), "%llu-%llu-%d.peak",
-			(unsigned long long)stat_mount.st_ino,
-			(unsigned long long)stat_file.st_ino,
-			_channel);
-#else
-	snprintf (buf, sizeof (buf), "%" PRId64 "-%" PRId64 "-%d.peak", (int64_t) stat_mount.st_ino, (int64_t) stat_file.st_ino, _channel);
-#endif
-
-	string res = peak_dir;
-	res += buf;
-	res += peakfile_suffix;
-
-	return res;
+	return _session.construct_peak_filepath (base, in_session, old_peak_name);
 }
 
 bool
-AudioFileSource::get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg)
+AudioFileSource::get_soundfile_info (const string& path, SoundFileInfo& _info, string& error_msg)
 {
         /* try sndfile first because it gets timecode info from .wav (BWF) if it exists,
            which at present, ExtAudioFile from Apple seems unable to do.
@@ -326,7 +237,7 @@ AudioFileSource::mark_streaming_write_completed (const Lock& lock)
 int
 AudioFileSource::move_dependents_to_trash()
 {
-	return ::g_unlink (peakpath.c_str());
+	return ::g_unlink (_peakpath.c_str());
 }
 
 void
@@ -353,8 +264,11 @@ AudioFileSource::is_empty (Session& /*s*/, string path)
 int
 AudioFileSource::setup_peakfile ()
 {
+	if (_session.deletion_in_progress()) {
+		return 0;
+	}
 	if (!(_flags & NoPeakFile)) {
-		return initialize_peakfile (_path);
+		return initialize_peakfile (_path, within_session());
 	} else {
 		return 0;
 	}
@@ -429,4 +343,4 @@ AudioFileSource::get_interleave_buffer (framecnt_t size)
 
 	return ssb->buf;
 }
-	
+