X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=9c1b969190c530d8cb2ec95b066b1b02b0c349a1;hb=aa0effb4cb38f4c3a06564bd9e6a0ee516d4f958;hp=9f24814d49e52f585da5f130fd20cf37150a18d1;hpb=67b4433b0c8b83ca03dbc517c71e85b9ab619a0f;p=ardour.git

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 9f24814d49..9c1b969190 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -32,25 +32,25 @@
 
 #include "pbd/convert.h"
 #include "pbd/basename.h"
+#include "pbd/file_utils.h"
 #include "pbd/mountpoint.h"
 #include "pbd/stl_delete.h"
 #include "pbd/strsplit.h"
 #include "pbd/shortpath.h"
+#include "pbd/stacktrace.h"
 #include "pbd/enumwriter.h"
 
 #include <sndfile.h>
 
+#include <glib/gstdio.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "ardour/audiofilesource.h"
 #include "ardour/debug.h"
-#include "ardour/sndfile_helpers.h"
 #include "ardour/sndfilesource.h"
 #include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/source_factory.h"
 #include "ardour/filename_extensions.h"
 
 // if these headers come before sigc++ is included
@@ -71,50 +71,68 @@ using namespace Glib;
 string AudioFileSource::peak_dir = "";
 
 PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
-uint64_t           AudioFileSource::header_position_offset = 0;
+framecnt_t         AudioFileSource::header_position_offset = 0;
 
 /* XXX maybe this too */
 char AudioFileSource::bwf_serial_number[13] = "000000000000";
 
 struct SizedSampleBuffer {
-    nframes_t size;
-    Sample* buf;
+	framecnt_t size;
+	Sample* buf;
 
-    SizedSampleBuffer (nframes_t sz) : size (sz) {
-	    buf = new Sample[size];
-    }
+	SizedSampleBuffer (framecnt_t sz) : size (sz) {
+		buf = new Sample[size];
+	}
 
-    ~SizedSampleBuffer() {
-	    delete [] buf;
-    }
+	~SizedSampleBuffer() {
+		delete [] buf;
+	}
 };
 
-Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
+Glib::Threads::Private<SizedSampleBuffer> thread_interleave_buffer;
 
-/** Constructor used for existing internal-to-session files. */
+/** Constructor used for existing external-to-session files. */
 AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag flags)
 	: Source (s, DataType::AUDIO, path, flags)
 	, AudioSource (s, path)
-	, FileSource (s, DataType::AUDIO, path, flags)
+          /* note that external files have their own path as "origin" */
+	, FileSource (s, DataType::AUDIO, path, path, flags)
 {
 	if (init (_path, true)) {
 		throw failed_constructor ();
 	}
-
 }
 
 /** Constructor used for new internal-to-session files. */
-AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag flags,
+AudioFileSource::AudioFileSource (Session& s, const string& path, const string& origin, Source::Flag flags,
 				  SampleFormat /*samp_format*/, HeaderFormat /*hdr_format*/)
 	: Source (s, DataType::AUDIO, path, flags)
 	, AudioSource (s, path)
-	, FileSource (s, DataType::AUDIO, path, flags)
+	, FileSource (s, DataType::AUDIO, path, origin, flags)
 {
+        /* note that origin remains empty */
+
 	if (init (_path, false)) {
 		throw failed_constructor ();
 	}
 }
 
+/** Constructor used for existing internal-to-session files during crash
+ * recovery. File must exist
+ */
+AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag flags, bool /* ignored-exists-for-prototype differentiation */)
+	: Source (s, DataType::AUDIO, path, flags)
+	, AudioSource (s, path)
+	, FileSource (s, DataType::AUDIO, path, string(), flags)
+{
+        /* note that origin remains empty */
+
+	if (init (_path, true)) {
+		throw failed_constructor ();
+	}
+}
+
+
 /** Constructor used for existing internal-to-session files via XML.  File must exist. */
 AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exist)
 	: Source (s, node)
@@ -124,7 +142,7 @@ AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exi
 	if (set_state (node, Stateful::loading_state_version)) {
 		throw failed_constructor ();
 	}
-	
+
 	if (init (_path, must_exist)) {
 		throw failed_constructor ();
 	}
@@ -134,8 +152,8 @@ AudioFileSource::~AudioFileSource ()
 {
 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("AudioFileSource destructor %1, removable? %2\n", _path, removable()));
 	if (removable()) {
-		unlink (_path.c_str());
-		unlink (peakpath.c_str());
+		::g_unlink (_path.c_str());
+		::g_unlink (peakpath.c_str());
 	}
 }
 
@@ -241,7 +259,7 @@ AudioFileSource::get_soundfile_info (string path, SoundFileInfo& _info, string&
 	if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
 		return true;
 	}
-        
+
 #ifdef HAVE_COREAUDIO
 	if (CoreAudioSource::get_soundfile_info (path, _info, error_msg) == 0) {
 		return true;
@@ -258,6 +276,7 @@ AudioFileSource::get_state ()
 	char buf[32];
 	snprintf (buf, sizeof (buf), "%u", _channel);
 	root.add_property (X_("channel"), buf);
+        root.add_property (X_("origin"), _origin);
 	return root;
 }
 
@@ -292,11 +311,11 @@ AudioFileSource::mark_streaming_write_completed ()
 int
 AudioFileSource::move_dependents_to_trash()
 {
-	return ::unlink (peakpath.c_str());
+	return ::g_unlink (peakpath.c_str());
 }
 
 void
-AudioFileSource::set_header_position_offset (nframes_t offset)
+AudioFileSource::set_header_position_offset (framecnt_t offset)
 {
 	header_position_offset = offset;
 	HeaderPositionOffsetChanged ();
@@ -320,7 +339,7 @@ int
 AudioFileSource::setup_peakfile ()
 {
 	if (!(_flags & NoPeakFile)) {
-		return initialize_peakfile (_file_is_new, _path);
+		return initialize_peakfile (_path);
 	} else {
 		return 0;
 	}
@@ -379,7 +398,7 @@ AudioFileSource::safe_audio_file_extension(const string& file)
 }
 
 Sample*
-AudioFileSource::get_interleave_buffer (nframes_t size)
+AudioFileSource::get_interleave_buffer (framecnt_t size)
 {
 	SizedSampleBuffer* ssb;
 
@@ -395,3 +414,4 @@ AudioFileSource::get_interleave_buffer (nframes_t size)
 
 	return ssb->buf;
 }
+