Minor tidy-ups to MTDM code; add test.

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

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 9f24814d49e52f585da5f130fd20cf37150a18d1..e101f5b25b31710d2badb4a249283b6c7d8032d8 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -46,11 +46,8 @@
 
 #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,45 +68,49 @@ 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;
 
-/** 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)
 {
+        /* note that origin remains empty */
+
        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 ();
        }
@@ -124,7 +125,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 ();
        }
@@ -241,7 +242,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 +259,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;
 }
 
@@ -296,7 +298,7 @@ AudioFileSource::move_dependents_to_trash()
 }
 
 void
-AudioFileSource::set_header_position_offset (nframes_t offset)
+AudioFileSource::set_header_position_offset (framecnt_t offset)
 {
        header_position_offset = offset;
        HeaderPositionOffsetChanged ();
@@ -379,7 +381,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;