X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=0e498c3d59a418d88bae2dab270474e43bd34009;hb=8f59346592b8232e910ce0bbdc247cf8cecde4dd;hp=0412ee09665360ed5c86f9625241b51b481b7ece;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 0412ee0966..0e498c3d59 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -45,6 +45,7 @@
 #include <glibmm/thread.h>
 
 #include "ardour/audiofilesource.h"
+#include "ardour/debug.h"
 #include "ardour/sndfile_helpers.h"
 #include "ardour/sndfilesource.h"
 #include "ardour/session.h"
@@ -69,7 +70,7 @@ using namespace Glib;
 
 ustring AudioFileSource::peak_dir = "";
 
-sigc::signal<void> AudioFileSource::HeaderPositionOffsetChanged;
+PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
 uint64_t           AudioFileSource::header_position_offset = 0;
 
 /* XXX maybe this too */
@@ -91,47 +92,47 @@ struct SizedSampleBuffer {
 Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
 
 /** Constructor used for existing internal-to-session files. */
-AudioFileSource::AudioFileSource (Session& s, const ustring& path, bool embedded, Source::Flag flags)
+AudioFileSource::AudioFileSource (Session& s, const ustring& path, Source::Flag flags)
 	: Source (s, DataType::AUDIO, path, flags)
 	, AudioSource (s, path)
-	, FileSource (s, DataType::AUDIO, path, embedded, flags)
+	, FileSource (s, DataType::AUDIO, path, flags)
 {
-	if (init (path, true)) {
+	if (init (_path, true)) {
 		throw failed_constructor ();
 	}
+
 }
 
 /** Constructor used for new internal-to-session files. */
-AudioFileSource::AudioFileSource (Session& s, const ustring& path, bool embedded, Source::Flag flags,
+AudioFileSource::AudioFileSource (Session& s, const ustring& path, Source::Flag flags,
 				  SampleFormat /*samp_format*/, HeaderFormat /*hdr_format*/)
 	: Source (s, DataType::AUDIO, path, flags)
 	, AudioSource (s, path)
-	, FileSource (s, DataType::AUDIO, path, embedded, flags)
+	, FileSource (s, DataType::AUDIO, path, flags)
 {
-	_is_embedded = false;
-
-	if (init (path, false)) {
+	if (init (_path, false)) {
 		throw failed_constructor ();
 	}
 }
 
-/** Constructor used for existing internal-to-session files.  File must exist. */
+/** 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)
 	, AudioSource (s, node)
 	, FileSource (s, node, must_exist)
 {
-	if (set_state (node)) {
+	if (set_state (node, Stateful::loading_state_version)) {
 		throw failed_constructor ();
 	}
-
-	if (init (_name, must_exist)) {
+	
+	if (init (_path, must_exist)) {
 		throw failed_constructor ();
 	}
 }
 
 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());
@@ -168,7 +169,7 @@ AudioFileSource::find_broken_peakfile (ustring peak_path, ustring audio_path)
 
 	if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
 
-		if (is_embedded()) {
+		if (!within_session()) {
 
 			/* it would be nice to rename it but the nature of
 			   the bug means that we can't reliably use it.
@@ -234,16 +235,20 @@ AudioFileSource::old_peak_path (ustring audio_path)
 bool
 AudioFileSource::get_soundfile_info (ustring 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.
+        */
+
+	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;
 	}
 #endif // HAVE_COREAUDIO
 
-	if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
-		return true;
-	}
-
 	return false;
 }
 
@@ -258,17 +263,17 @@ AudioFileSource::get_state ()
 }
 
 int
-AudioFileSource::set_state (const XMLNode& node)
+AudioFileSource::set_state (const XMLNode& node, int version)
 {
-	if (Source::set_state (node)) {
+	if (Source::set_state (node, version)) {
 		return -1;
 	}
 
-	if (AudioSource::set_state (node)) {
+	if (AudioSource::set_state (node, version)) {
 		return -1;
 	}
 
-	if (FileSource::set_state (node)) {
+	if (FileSource::set_state (node, version)) {
 		return -1;
 	}