add "origin" property to FileSource so that we can track multiple imports

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

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 0ccbaf3154afadbb4f557feb6e0f7bde24723bd8..39701f24cc25550cff57942214ae4148c4f7a3c1 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -68,7 +68,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
 
-ustring AudioFileSource::peak_dir = "";
+string AudioFileSource::peak_dir = "";
 
 PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
 uint64_t           AudioFileSource::header_position_offset = 0;
@@ -91,25 +91,30 @@ 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, Source::Flag flags)
+/** 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 ();
        }
-
+        cerr << "audiofile source created with path " << path << endl;
 }
 
 /** Constructor used for new internal-to-session files. */
-AudioFileSource::AudioFileSource (Session& s, const ustring& 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 ();
        }
@@ -140,16 +145,15 @@ AudioFileSource::~AudioFileSource ()
 }
 
 int
-AudioFileSource::init (const ustring& pathstr, bool must_exist)
+AudioFileSource::init (const string& pathstr, bool must_exist)
 {
-       _peaks_built = false;
        return FileSource::init (pathstr, must_exist);
 }
 
-ustring
-AudioFileSource::peak_path (ustring audio_path)
+string
+AudioFileSource::peak_path (string audio_path)
 {
-       ustring base;
+       string base;
 
        base = PBD::basename_nosuffix (audio_path);
        base += '%';
@@ -158,10 +162,10 @@ AudioFileSource::peak_path (ustring audio_path)
        return _session.peak_path (base);
 }
 
-ustring
-AudioFileSource::find_broken_peakfile (ustring peak_path, ustring audio_path)
+string
+AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
 {
-       ustring str;
+       string str;
 
        /* check for the broken location in use by 2.0 for several months */
 
@@ -199,21 +203,21 @@ AudioFileSource::find_broken_peakfile (ustring peak_path, ustring audio_path)
        return peak_path;
 }
 
-ustring
-AudioFileSource::broken_peak_path (ustring audio_path)
+string
+AudioFileSource::broken_peak_path (string audio_path)
 {
-       return _session.peak_path (audio_path);
+       return _session.peak_path (basename_nosuffix (audio_path));
 }
 
-ustring
-AudioFileSource::old_peak_path (ustring audio_path)
+string
+AudioFileSource::old_peak_path (string audio_path)
 {
        /* XXX hardly bombproof! fix me */
 
        struct stat stat_file;
        struct stat stat_mount;
 
-       ustring mp = mountpoint (audio_path);
+       string mp = mountpoint (audio_path);
 
        stat (audio_path.c_str(), &stat_file);
        stat (mp.c_str(), &stat_mount);
@@ -225,7 +229,7 @@ AudioFileSource::old_peak_path (ustring audio_path)
        snprintf (buf, sizeof (buf), "%" PRId64 "-%" PRId64 "-%d.peak", (int64_t) stat_mount.st_ino, (int64_t) stat_file.st_ino, _channel);
 #endif
 
-       ustring res = peak_dir;
+       string res = peak_dir;
        res += buf;
        res += peakfile_suffix;
 
@@ -233,7 +237,7 @@ AudioFileSource::old_peak_path (ustring audio_path)
 }
 
 bool
-AudioFileSource::get_soundfile_info (ustring path, SoundFileInfo& _info, string& error_msg)
+AudioFileSource::get_soundfile_info (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.
@@ -259,6 +263,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;
 }
 
@@ -287,15 +292,7 @@ AudioFileSource::mark_streaming_write_completed ()
                return;
        }
 
-       /* XXX notice that we're readers of _peaks_built
-          but we must hold a solid lock on PeaksReady.
-       */
-
-       Glib::Mutex::Lock lm (_lock);
-
-       if (_peaks_built) {
-               PeaksReady (); /* EMIT SIGNAL */
-       }
+       AudioSource::mark_streaming_write_completed ();
 }
 
 int
@@ -312,7 +309,7 @@ AudioFileSource::set_header_position_offset (nframes_t offset)
 }
 
 bool
-AudioFileSource::is_empty (Session& /*s*/, ustring path)
+AudioFileSource::is_empty (Session& /*s*/, string path)
 {
        SoundFileInfo info;
        string err;
@@ -336,7 +333,7 @@ AudioFileSource::setup_peakfile ()
 }
 
 bool
-AudioFileSource::safe_audio_file_extension(const ustring& file)
+AudioFileSource::safe_audio_file_extension(const string& file)
 {
        const char* suffixes[] = {
                ".aif", ".AIF",