The Big Change: Store time in MidiModel as tempo time, not frame time.
[ardour.git] / libs / ardour / audiofilesource.cc
index 034b61860ac0a057ce1d56ca99b24a4bd041943d..0064fd0b8eec05065177e53c1dc37cf9c2c55558 100644 (file)
 
 #include <sys/time.h>
 #include <sys/stat.h>
+#include <stdio.h> // for rename(), sigh
 #include <unistd.h>
+#include <fcntl.h>
 #include <errno.h>
 
+#include <pbd/convert.h>
+#include <pbd/basename.h>
 #include <pbd/mountpoint.h>
-#include <pbd/pathscanner.h>
 #include <pbd/stl_delete.h>
 #include <pbd/strsplit.h>
+#include <pbd/shortpath.h>
+#include <pbd/enumwriter.h>
 
 #include <sndfile.h>
 
 #include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/thread.h>
 
 #include <ardour/audiofilesource.h>
 #include <ardour/sndfile_helpers.h>
 #include <ardour/sndfilesource.h>
-#include <ardour/destructive_filesource.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
 // the parser throws ObjC++ errors. (nil is a keyword)
 
 using namespace ARDOUR;
 using namespace PBD;
+using namespace Glib;
 
-string AudioFileSource::peak_dir = "";
-string AudioFileSource::search_path;
+ustring AudioFileSource::peak_dir = "";
+ustring AudioFileSource::search_path;
 
 sigc::signal<void> AudioFileSource::HeaderPositionOffsetChanged;
 uint64_t           AudioFileSource::header_position_offset = 0;
 
-char   AudioFileSource::bwf_country_code[3] = "US";
-char   AudioFileSource::bwf_organization_code[4] = "LAS";
+/* XXX maybe this too */
 char   AudioFileSource::bwf_serial_number[13] = "000000000000";
 
-AudioFileSource::AudioFileSource (string idstr, Flag flags)
-       : AudioSource (idstr), _flags (flags)
+struct SizedSampleBuffer {
+    nframes_t size;
+    Sample* buf;
+
+    SizedSampleBuffer (nframes_t sz) : size (sz) { 
+           buf = new Sample[size];
+    }
+
+    ~SizedSampleBuffer() {
+           delete [] buf;
+    }
+};
+
+Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
+
+/** Constructor used for existing internal-to-session files.  File must exist. */
+AudioFileSource::AudioFileSource (Session& s, ustring path, Flag flags)
+       : AudioSource (s, path), _flags (flags),
+         _channel (0)
 {
-       /* constructor used for existing external to session files. file must exist already */
+       _is_embedded = AudioFileSource::determine_embeddedness (path);
 
-       if (init (idstr, true)) {
+       if (init (path, true)) {
                throw failed_constructor ();
        }
 
 }
 
-AudioFileSource::AudioFileSource (std::string path, Flag flags, SampleFormat samp_format, HeaderFormat hdr_format)
-       : AudioSource (path), _flags (flags)
+/** Constructor used for new internal-to-session files.  File cannot exist. */
+AudioFileSource::AudioFileSource (Session& s, ustring path, Flag flags, SampleFormat samp_format, HeaderFormat hdr_format)
+       : AudioSource (s, path), _flags (flags),
+         _channel (0)
 {
-       /* constructor used for new internal-to-session files. file cannot exist */
+       _is_embedded = false;
 
        if (init (path, false)) {
                throw failed_constructor ();
        }
 }
 
-AudioFileSource::AudioFileSource (const XMLNode& node)
-       : AudioSource (node), _flags (Flag (Writable|CanRename))
+/** Constructor used for existing internal-to-session files.  File must exist. */
+AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exist)
+       : AudioSource (s, node), _flags (Flag (Writable|CanRename))
+       /* _channel is set in set_state() or init() */
 {
-       /* constructor used for existing internal-to-session files. file must exist */
-
        if (set_state (node)) {
                throw failed_constructor ();
        }
+
+       string foo = _name;
        
-       if (init (_name, true)) {
+       if (init (foo, must_exist)) {
                throw failed_constructor ();
        }
 }
@@ -105,26 +135,30 @@ AudioFileSource::~AudioFileSource ()
        }
 }
 
+bool
+AudioFileSource::determine_embeddedness (ustring path)
+{
+       return (path.find("/") == 0);
+}
+
 bool
 AudioFileSource::removable () const
 {
-       return (_flags & Removable) && ((_flags & RemoveAtDestroy) || 
-                                     ((_flags & RemovableIfEmpty) && is_empty (_path)));
+       return (_flags & Removable) && ((_flags & RemoveAtDestroy) || ((_flags & RemovableIfEmpty) && length() == 0));
 }
 
 int
-AudioFileSource::init (string pathstr, bool must_exist)
+AudioFileSource::init (ustring pathstr, bool must_exist)
 {
-       bool is_new = false;
-
        _length = 0;
-       next_peak_clear_should_notify = false;
-       
-       if (!find (pathstr, must_exist, is_new)) {
-               return -1;
+       timeline_position = 0;
+       _peaks_built = false;
+
+       if (!find (pathstr, must_exist, file_is_new, _channel)) {
+               throw non_existent_source ();
        }
 
-       if (is_new && must_exist) {
+       if (file_is_new && must_exist) {
                return -1;
        }
 
@@ -132,214 +166,116 @@ AudioFileSource::init (string pathstr, bool must_exist)
 }
 
 
-string
-AudioFileSource::peak_path (string audio_path)
-{
-       return Session::peak_path_from_audio_path (audio_path);
-}
-
-string
-AudioFileSource::old_peak_path (string audio_path)
+ustring
+AudioFileSource::peak_path (ustring audio_path)
 {
-       /* XXX hardly bombproof! fix me */
-
-       struct stat stat_file;
-       struct stat stat_mount;
+       ustring base;
 
-       string mp = mountpoint (audio_path);
+       base = PBD::basename_nosuffix (audio_path);
+       base += '%';
+       base += (char) ('A' + _channel);
 
-       stat (audio_path.c_str(), &stat_file);
-       stat (mp.c_str(), &stat_mount);
-
-       char buf[32];
-#ifdef __APPLE__
-       snprintf (buf, sizeof (buf), "%u-%u-%d.peak", stat_mount.st_ino, stat_file.st_ino, channel);
-#else
-       snprintf (buf, sizeof (buf), "%ld-%ld-%d.peak", stat_mount.st_ino, stat_file.st_ino, channel);
-#endif
-
-       string res = peak_dir;
-       res += buf;
-
-       return res;
+       return _session.peak_path (base);
 }
 
-#ifdef HAVE_COREAUDIO
-
-AudioFileSource*
-AudioFileSource::create (const XMLNode& node)
+ustring
+AudioFileSource::find_broken_peakfile (ustring peak_path, ustring audio_path)
 {
-       AudioFileSource* es = 0;
+       ustring str;
 
-       if (node.property (X_("destructive")) != 0) {
-               
-               es = new DestructiveFileSource (node);
+       /* check for the broken location in use by 2.0 for several months */
        
-       } else {
+       str = broken_peak_path (audio_path);
+       
+       if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
                
-               try {
-                       es = new CoreAudioSource (node);
-               } 
+               if (is_embedded()) {
+                       
+                       /* 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.
+               */
                
-               catch (failed_constructor& err) {
-                       es = new SndFileSource (node);
+               
+               str = old_peak_path (audio_path);       
+               if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
+                       peak_path = str;
                }
        }
-       
-       return es;
-}
 
-#else
+       return peak_path;
+}
 
-AudioFileSource*
-AudioFileSource::create (const XMLNode& node)
+ustring
+AudioFileSource::broken_peak_path (ustring audio_path)
 {
-       if (node.property (X_("destructive")) != 0) {
-               
-               return new DestructiveFileSource (node);
-               
-       } else {
-               
-               return new SndFileSource (node);
-       }
+       return _session.peak_path (audio_path);
 }
 
-#endif // HAVE_COREAUDIO
-
-#ifdef HAVE_COREAUDIO
-AudioFileSource*
-AudioFileSource::create (const string& idstr, Flag flags)
+ustring
+AudioFileSource::old_peak_path (ustring audio_path)
 {
-       AudioFileSource* es = 0;
+       /* XXX hardly bombproof! fix me */
 
-       try {
-               es = new CoreAudioSource (idstr, flags);
-       }
+       struct stat stat_file;
+       struct stat stat_mount;
 
-       catch (failed_constructor& err) {
-               es = new SndFileSource (idstr, flags);
-       }
+       ustring mp = mountpoint (audio_path);
 
-       return es;
-}
+       stat (audio_path.c_str(), &stat_file);
+       stat (mp.c_str(), &stat_mount);
 
+       char buf[32];
+#ifdef __APPLE__
+       snprintf (buf, sizeof (buf), "%u-%u-%d.peak", stat_mount.st_ino, stat_file.st_ino, _channel);
 #else
+       snprintf (buf, sizeof (buf), "%ld-%ld-%d.peak", stat_mount.st_ino, stat_file.st_ino, _channel);
+#endif
 
-AudioFileSource*
-AudioFileSource::create (const string& idstr, Flag flags)
-{
-       return new SndFileSource (idstr, flags);
-}
-
-#endif // HAVE_COREAUDIO
-
-#ifdef HAVE_COREAUDIO
-std::string 
-CFStringRefToStdString(CFStringRef stringRef)
-{
-       CFIndex size = 
-               CFStringGetMaximumSizeForEncoding(CFStringGetLength(stringRef) , 
-               kCFStringEncodingASCII);
-           char *buf = new char[size];
-       
-       std::string result;
+       ustring res = peak_dir;
+       res += buf;
+       res += peakfile_suffix;
 
-       if(CFStringGetCString(stringRef, buf, size, kCFStringEncodingASCII)) {
-           result = buf;
-       }
-       delete [] buf;
-       return result;
+       return res;
 }
-#endif // HAVE_COREAUDIO
 
 bool
-AudioFileSource::get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg)
+AudioFileSource::get_soundfile_info (ustring path, SoundFileInfo& _info, string& error_msg)
 {
 #ifdef HAVE_COREAUDIO
-       OSStatus err = noErr;
-    FSRef ref; 
-       ExtAudioFileRef af = 0;
-       size_t size;
-    CFStringRef name;
-
-    err = FSPathMakeRef ((UInt8*)path.c_str(), &ref, 0);
-       if (err != noErr) {
-        ExtAudioFileDispose (af);
-               goto libsndfile;
-       }
-
-       err = ExtAudioFileOpen(&ref, &af);
-       if (err != noErr) {
-        ExtAudioFileDispose (af);
-               goto libsndfile;
-       }
-
-       AudioStreamBasicDescription absd;
-       memset(&absd, 0, sizeof(absd));
-       size = sizeof(AudioStreamBasicDescription);
-       err = ExtAudioFileGetProperty(af,
-                       kExtAudioFileProperty_FileDataFormat, &size, &absd);
-       if (err != noErr) {
-        ExtAudioFileDispose (af);
-               goto libsndfile;
-       }
-
-       _info.samplerate = absd.mSampleRate;
-       _info.channels   = absd.mChannelsPerFrame;
-
-    size = sizeof(_info.length);
-    err = ExtAudioFileGetProperty(af, kExtAudioFileProperty_FileLengthFrames, &size, &_info.length);
-    if (err != noErr) {
-        ExtAudioFileDispose (af);
-               goto libsndfile;
-    }
-
-       size = sizeof(CFStringRef);
-       err = AudioFormatGetProperty(
-                       kAudioFormatProperty_FormatName, sizeof(absd), &absd, &size, &name);
-       if (err != noErr) {
-        ExtAudioFileDispose (af);
-               goto libsndfile;
+       if (CoreAudioSource::get_soundfile_info (path, _info, error_msg) == 0) {
+               return true;
        }
-
-       _info.format_name = CFStringRefToStdString(name);
-
-    ExtAudioFileDispose (af);
-       return true;
-       
-libsndfile:
 #endif // HAVE_COREAUDIO
 
-       SNDFILE *sf;
-       SF_INFO sf_info;
-
-       sf_info.format = 0; // libsndfile says to clear this before sf_open().
-
-       if ((sf = sf_open ((char*) path.c_str(), SFM_READ, &sf_info)) == 0) { 
-               char errbuf[256];
-               error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-               return false;
+       if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
+               return true;
        }
 
-       sf_close (sf);
-
-       _info.samplerate  = sf_info.samplerate;
-       _info.channels    = sf_info.channels;
-       _info.length      = sf_info.frames;
-       _info.format_name = string_compose("Format: %1, %2",
-                                          sndfile_major_format(sf_info.format),
-                                          sndfile_minor_format(sf_info.format));
-       return true;
+       return false;
 }
 
 XMLNode&
 AudioFileSource::get_state ()
 {
        XMLNode& root (AudioSource::get_state());
-       char buf[16];
-       snprintf (buf, sizeof (buf), "0x%x", (int)_flags);
-       root.add_property ("flags", buf);
+       char buf[32];
+       root.add_property (X_("flags"), enum_2_string (_flags));
+       snprintf (buf, sizeof (buf), "%u", _channel);
+       root.add_property (X_("channel"), buf);
        return root;
 }
 
@@ -353,15 +289,27 @@ AudioFileSource::set_state (const XMLNode& node)
        }
 
        if ((prop = node.property (X_("flags"))) != 0) {
+               _flags = Flag (string_2_enum (prop->value(), _flags));
+       } else {
+               _flags = Flag (0);
 
-               int ival;
-               sscanf (prop->value().c_str(), "0x%x", &ival);
-               _flags = Flag (ival);
+       }
 
+       if ((prop = node.property (X_("channel"))) != 0) {
+               _channel = atoi (prop->value());
        } else {
+               _channel = 0;
+       }
 
-               _flags = Flag (0);
+       if ((prop = node.property (X_("name"))) != 0) {
+               _is_embedded = AudioFileSource::determine_embeddedness (prop->value());
+       } else {
+               _is_embedded = false;
+       }
 
+       if ((prop = node.property (X_("destructive"))) != 0) {
+               /* old style, from the period when we had DestructiveFileSource */
+               _flags = Flag (_flags | Destructive);
        }
 
        return 0;
@@ -370,10 +318,14 @@ AudioFileSource::set_state (const XMLNode& node)
 void
 AudioFileSource::mark_for_remove ()
 {
-       if (!writable()) {
+       // This operation is not allowed for sources for destructive tracks or embedded files.
+       // Fortunately mark_for_remove() is never called for embedded files. This function
+       // must be fixed if that ever happens.
+       if (_flags & Destructive) {
                return;
        }
-       _flags = Flag (_flags | RemoveAtDestroy);
+
+       _flags = Flag (_flags | Removable | RemoveAtDestroy);
 }
 
 void
@@ -382,19 +334,20 @@ AudioFileSource::mark_streaming_write_completed ()
        if (!writable()) {
                return;
        }
+       
+       /* XXX notice that we're readers of _peaks_built
+          but we must hold a solid lock on PeaksReady.
+       */
 
        Glib::Mutex::Lock lm (_lock);
 
-       next_peak_clear_should_notify = true;
-
-       if (_peaks_built || pending_peak_builds.empty()) {
-               _peaks_built = true;
-                PeaksReady (); /* EMIT SIGNAL */
+       if (_peaks_built) {
+               PeaksReady (); /* EMIT SIGNAL */
        }
 }
 
 void
-AudioFileSource::mark_take (string id)
+AudioFileSource::mark_take (ustring id)
 {
        if (writable()) {
                _take_id = id;
@@ -402,34 +355,33 @@ AudioFileSource::mark_take (string id)
 }
 
 int
-AudioFileSource::move_to_trash (const string trash_dir_name)
+AudioFileSource::move_to_trash (const ustring& trash_dir_name)
 {
-       string newpath;
+       if (is_embedded()) {
+               cerr << "tried to move an embedded region to trash" << endl;
+               return -1;
+       }
 
        if (!writable()) {
                return -1;
        }
 
-       /* don't move the file across filesystems, just
-          stick it in the `trash_dir_name' directory
-          on whichever filesystem it was already on.
+       /* don't move the file across filesystems, just stick it in the
+          trash_dir_name directory on whichever filesystem it was already on
        */
-
+       
+       ustring newpath;
        newpath = Glib::path_get_dirname (_path);
-       newpath = Glib::path_get_dirname (newpath);
+       newpath = Glib::path_get_dirname (newpath); 
 
-       newpath += '/';
-       newpath += trash_dir_name;
-       newpath += '/';
+       newpath += string("/") + trash_dir_name + "/";
        newpath += Glib::path_get_basename (_path);
 
+       /* the new path already exists, try versioning */
        if (access (newpath.c_str(), F_OK) == 0) {
-
-               /* the new path already exists, try versioning */
-               
                char buf[PATH_MAX+1];
                int version = 1;
-               string newpath_v;
+               ustring newpath_v;
 
                snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), version);
                newpath_v = buf;
@@ -440,23 +392,19 @@ AudioFileSource::move_to_trash (const string trash_dir_name)
                }
                
                if (version == 999) {
-                       error << string_compose (_("there are already 1000 files with names like %1; versioning discontinued"),
-                                         newpath)
-                             << endmsg;
+                       PBD::error << string_compose (
+                                       _("there are already 1000 files with names like %1; versioning discontinued"),
+                                       newpath)
+                               << endmsg;
                } else {
                        newpath = newpath_v;
                }
-
-       } else {
-
-               /* it doesn't exist, or we can't read it or something */
-
        }
 
        if (::rename (_path.c_str(), newpath.c_str()) != 0) {
-               error << string_compose (_("cannot rename audio file source from %1 to %2 (%3)"),
-                                 _path, newpath, strerror (errno))
-                     << endmsg;
+               PBD::error << string_compose (
+                               _("cannot rename midi file source from %1 to %2 (%3)"),
+                               _path, newpath, strerror (errno)) << endmsg;
                return -1;
        }
 
@@ -473,36 +421,27 @@ AudioFileSource::move_to_trash (const string trash_dir_name)
        peakpath = "";
        
        /* file can not be removed twice, since the operation is not idempotent */
-
        _flags = Flag (_flags & ~(RemoveAtDestroy|Removable|RemovableIfEmpty));
 
        return 0;
 }
 
 bool
-AudioFileSource::find (string pathstr, bool must_exist, bool& isnew)
+AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew, uint16_t& chan)
 {
-       string::size_type pos;
+       ustring::size_type pos;
        bool ret = false;
 
        isnew = false;
 
-       /* clean up PATH:CHANNEL notation so that we are looking for the correct path */
-
-       if ((pos = pathstr.find_last_of (':')) == string::npos) {
-               pathstr = pathstr;
-       } else {
-               pathstr = pathstr.substr (0, pos);
-       }
-
        if (pathstr[0] != '/') {
 
                /* non-absolute pathname: find pathstr in search path */
 
-               vector<string> dirs;
+               vector<ustring> dirs;
                int cnt;
-               string fullpath;
-               string keeppath;
+               ustring fullpath;
+               ustring keeppath;
 
                if (search_path.length() == 0) {
                        error << _("FileSource: search path not set") << endmsg;
@@ -513,18 +452,65 @@ AudioFileSource::find (string pathstr, bool must_exist, bool& isnew)
 
                cnt = 0;
                
-               for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-
+               for (vector<ustring>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
                        fullpath = *i;
                        if (fullpath[fullpath.length()-1] != '/') {
                                fullpath += '/';
                        }
+
                        fullpath += pathstr;
+
+                       /* i (paul) made a nasty design error by using ':' as a special character in
+                          Ardour 0.99 .. this hack tries to make things sort of work.
+                       */
                        
-                       if (access (fullpath.c_str(), R_OK) == 0) {
-                               keeppath = fullpath;
-                               ++cnt;
-                       } 
+                       if ((pos = pathstr.find_last_of (':')) != ustring::npos) {
+                               
+                               if (Glib::file_test (fullpath, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+
+                                       /* its a real file, no problem */
+                                       
+                                       keeppath = fullpath;
+                                       ++cnt;
+
+                               } else {
+                                       
+                                       if (must_exist) {
+                                               
+                                               /* might be an older session using file:channel syntax. see if the version
+                                                  without the :suffix exists
+                                                */
+                                               
+                                               ustring shorter = pathstr.substr (0, pos);
+                                               fullpath = *i;
+
+                                               if (fullpath[fullpath.length()-1] != '/') {
+                                                       fullpath += '/';
+                                               }
+
+                                               fullpath += shorter;
+
+                                               if (Glib::file_test (pathstr, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+                                                       chan = atoi (pathstr.substr (pos+1));
+                                                       pathstr = shorter;
+                                                       keeppath = fullpath;
+                                                       ++cnt;
+                                               } 
+                                               
+                                       } else {
+                                               
+                                               /* new derived file (e.g. for timefx) being created in a newer session */
+                                               
+                                       }
+                               }
+
+                       } else {
+
+                               if (Glib::file_test (fullpath, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+                                       keeppath = fullpath;
+                                       ++cnt;
+                               } 
+                       }
                }
 
                if (cnt > 1) {
@@ -541,7 +527,17 @@ AudioFileSource::find (string pathstr, bool must_exist, bool& isnew)
                                isnew = true;
                        }
                }
-               
+
+               /* Current find() is unable to parse relative path names to yet non-existant
+                  sources. QuickFix(tm) */
+               if (keeppath == "") {
+                       if (must_exist) {
+                               error << "AudioFileSource::find(), keeppath = \"\", but the file must exist" << endl;
+                       } else {
+                               keeppath = pathstr;
+                       }
+               }
+
                _name = pathstr;
                _path = keeppath;
                ret = true;
@@ -549,14 +545,31 @@ AudioFileSource::find (string pathstr, bool must_exist, bool& isnew)
        } else {
                
                /* external files and/or very very old style sessions include full paths */
+
+               /* ugh, handle ':' situation */
+
+               if ((pos = pathstr.find_last_of (':')) != ustring::npos) {
+                       
+                       ustring shorter = pathstr.substr (0, pos);
+
+                       if (Glib::file_test (shorter, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+                               chan = atoi (pathstr.substr (pos+1));
+                               pathstr = shorter;
+                       }
+               }
                
                _path = pathstr;
-               _name = pathstr.substr (pathstr.find_last_of ('/') + 1);
-               
-               if (access (_path.c_str(), R_OK) != 0) {
 
-                       /* file does not exist or we cannot read it */
+               if (is_embedded()) {
+                       _name = pathstr;
+               } else {
+                       _name = pathstr.substr (pathstr.find_last_of ('/') + 1);
+               }
+
+               if (!Glib::file_test (pathstr, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
 
+                       /* file does not exist or we cannot read it */
+                       
                        if (must_exist) {
                                error << string_compose(_("Filesource: cannot find required file (%1): %2"), _path, strerror (errno)) << endmsg;
                                goto out;
@@ -577,6 +590,7 @@ AudioFileSource::find (string pathstr, bool must_exist, bool& isnew)
                        /* already exists */
 
                        ret = true;
+
                }
        }
        
@@ -585,21 +599,20 @@ AudioFileSource::find (string pathstr, bool must_exist, bool& isnew)
 }
 
 void
-AudioFileSource::set_search_path (string p)
+AudioFileSource::set_search_path (ustring p)
 {
        search_path = p;
 }
 
 void
-AudioFileSource::set_header_position_offset (jack_nframes_t offset)
+AudioFileSource::set_header_position_offset (nframes_t offset)
 {
        header_position_offset = offset;
-       cerr << "hpo set to " << offset << endl;
        HeaderPositionOffsetChanged ();
 }
 
 void
-AudioFileSource::set_timeline_position (jack_nframes_t pos)
+AudioFileSource::set_timeline_position (int64_t pos)
 {
        timeline_position = pos;
 }
@@ -607,25 +620,37 @@ AudioFileSource::set_timeline_position (jack_nframes_t pos)
 void
 AudioFileSource::set_allow_remove_if_empty (bool yn)
 {
-       if (writable()) {
-               allow_remove_if_empty = yn;
+       if (!writable()) {
+               return;
+       }
+
+       if (yn) {
+               _flags = Flag (_flags | RemovableIfEmpty);
+       } else {
+               _flags = Flag (_flags & ~RemovableIfEmpty);
        }
 }
 
 int
-AudioFileSource::set_name (string newname, bool destructive)
+AudioFileSource::set_source_name (ustring newname, bool destructive)
 {
        Glib::Mutex::Lock lm (_lock);
-       string oldpath = _path;
-       string newpath = Session::change_audio_path_by_name (oldpath, _name, newname, destructive);
+       ustring oldpath = _path;
+       ustring newpath = Session::change_audio_path_by_name (oldpath, _name, newname, destructive);
 
        if (newpath.empty()) {
                error << string_compose (_("programming error: %1"), "cannot generate a changed audio path") << endmsg;
                return -1;
        }
 
+       // Test whether newpath exists, if yes notify the user but continue. 
+       if (access(newpath.c_str(),F_OK) == 0) {
+               error << _("Programming error! Ardour tried to rename a file over another file! It's safe to continue working, but please report this to the developers.") << endmsg;
+               return -1;
+       }
+
        if (rename (oldpath.c_str(), newpath.c_str()) != 0) {
-               error << string_compose (_("cannot rename audio file for %1 to %2"), _name, newpath) << endmsg;
+               error << string_compose (_("cannot rename audio file %1 to %2"), _name, newpath) << endmsg;
                return -1;
        }
 
@@ -636,16 +661,94 @@ AudioFileSource::set_name (string newname, bool destructive)
 }
 
 bool
-AudioFileSource::is_empty (string path)
+AudioFileSource::is_empty (Session& s, ustring path)
 {
-       bool ret = false;
-       AudioFileSource* afs = create (path, NoPeakFile);
+       SoundFileInfo info;
+       string err;
+       
+       if (!get_soundfile_info (path, info, err)) {
+               /* dangerous: we can't get info, so assume that its not empty */
+               return false; 
+       }
+
+       return info.length == 0;
+}
 
-       if (afs) {
-               ret = (afs->length() == 0);
-               delete afs;
+int
+AudioFileSource::setup_peakfile ()
+{
+       if (!(_flags & NoPeakFile)) {
+               return initialize_peakfile (file_is_new, _path);
+       } else {
+               return 0;
        }
+}
 
-       return ret;
+bool
+AudioFileSource::safe_file_extension(ustring file)
+{
+       const char* suffixes[] = {
+               ".wav", ".WAV",
+               ".aiff", ".AIFF",
+               ".caf", ".CAF",
+               ".aif", ".AIF",
+               ".amb", ".AMB",
+               ".snd", ".SND",
+               ".au", ".AU",
+               ".raw", ".RAW",
+               ".sf", ".SF",
+               ".cdr", ".CDR",
+               ".smp", ".SMP",
+               ".maud", ".MAUD",
+               ".vwe", ".VWE",
+               ".paf", ".PAF",
+               ".voc", ".VOC",
+#ifdef HAVE_FLAC
+               ".flac", ".FLAC",
+#endif // HAVE_FLAC
+#ifdef HAVE_COREAUDIO
+               ".mp3", ".MP3",
+               ".aac", ".AAC",
+               ".mp4", ".MP4",
+#endif // HAVE_COREAUDIO
+       };
+
+       for (size_t n = 0; n < sizeof(suffixes)/sizeof(suffixes[0]); ++n) {
+               if (file.rfind (suffixes[n]) == file.length() - strlen (suffixes[n])) {
+                       return true;
+               }
+       }
+
+       return false;
 }
 
+void
+AudioFileSource::mark_immutable ()
+{
+       /* destructive sources stay writable, and their other flags don't
+          change.
+       */
+
+       if (!(_flags & Destructive)) {
+               _flags = Flag (_flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy|CanRename));
+       }
+}
+
+
+Sample*
+AudioFileSource::get_interleave_buffer (nframes_t size)
+{
+       SizedSampleBuffer* ssb;
+
+       if ((ssb = thread_interleave_buffer.get()) == 0) {
+               ssb = new SizedSampleBuffer (size);
+               thread_interleave_buffer.set (ssb);
+       }
+
+       if (ssb->size < size) {
+               ssb = new SizedSampleBuffer (size);
+               thread_interleave_buffer.set (ssb);
+       }
+
+       return ssb->buf;
+}