fix merge conflict from master
[ardour.git] / libs / ardour / audiofilesource.cc
index 434b64e88d7890084c6b1ec1fd621ee70f11cf9a..014baa90317b13c420af7c9863378ef6ddd4f976 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <vector>
 
 #include <sys/time.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#include <pbd/convert.h>
-#include <pbd/basename.h>
-#include <pbd/mountpoint.h>
-#include <pbd/stl_delete.h>
-#include <pbd/strsplit.h>
-#include <pbd/shortpath.h>
-#include <pbd/enumwriter.h>
+#include "pbd/convert.h"
+#include "pbd/basename.h"
+#include "pbd/mountpoint.h"
+#include "pbd/stl_delete.h"
+#include "pbd/strsplit.h"
+#include "pbd/shortpath.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/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>
+#include "ardour/audiofilesource.h"
+#include "ardour/debug.h"
+#include "ardour/sndfilesource.h"
+#include "ardour/session.h"
+#include "ardour/filename_extensions.h"
 
 // if these headers come before sigc++ is included
 // the parser throws ObjC++ errors. (nil is a keyword)
-#ifdef HAVE_COREAUDIO 
-#include <ardour/coreaudiosource.h>
+#ifdef HAVE_COREAUDIO
+#include "ardour/coreaudiosource.h"
 #include <AudioToolbox/ExtendedAudioFile.h>
 #include <AudioToolbox/AudioFormat.h>
 #endif // HAVE_COREAUDIO
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
 
-ustring AudioFileSource::peak_dir = "";
-ustring AudioFileSource::search_path;
+string AudioFileSource::peak_dir = "";
 
-sigc::signal<void> AudioFileSource::HeaderPositionOffsetChanged;
-uint64_t           AudioFileSource::header_position_offset = 0;
+PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
+framecnt_t         AudioFileSource::header_position_offset = 0;
 
 /* XXX maybe this too */
-char   AudioFileSource::bwf_serial_number[13] = "000000000000";
+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.  File must exist. */
-AudioFileSource::AudioFileSource (Session& s, ustring path, Source::Flag flags)
-       : AudioSource (s, path)
-       , _channel (0)
+/** 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)
+          /* note that external files have their own path as "origin" */
+       , FileSource (s, DataType::AUDIO, path, path, flags)
 {
-       _is_embedded = AudioFileSource::determine_embeddedness (path);
-
-       if (init (path, true)) {
+       if (init (_path, true)) {
                throw failed_constructor ();
        }
-
 }
 
-/** Constructor used for new internal-to-session files.  File cannot exist. */
-AudioFileSource::AudioFileSource (Session& s, ustring path, Source::Flag flags,
-               SampleFormat samp_format, HeaderFormat hdr_format)
-       : AudioSource (s, path)
-       ,  _channel (0)
+/** Constructor used for new internal-to-session files. */
+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, origin, flags)
 {
-       _is_embedded = false;
+        /* note that origin remains empty */
 
-       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)
-       : AudioSource (s, node)
-       /* _channel is set in set_state() or init() */
+       : 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 ();
        }
 
-       string foo = _name;
-       
-       if (init (foo, 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());
+               ::g_unlink (_path.c_str());
+               ::g_unlink (peakpath.c_str());
        }
 }
 
-bool
-AudioFileSource::determine_embeddedness (ustring path)
-{
-       return (path.find("/") == 0);
-}
-
-bool
-AudioFileSource::removable () const
-{
-       return (_flags & Removable) && ((_flags & RemoveAtDestroy) || ((_flags & RemovableIfEmpty) && length() == 0));
-}
-
 int
-AudioFileSource::init (ustring pathstr, bool must_exist)
+AudioFileSource::init (const string& pathstr, bool must_exist)
 {
-       _length = 0;
-       _timeline_position = 0;
-       _peaks_built = false;
-
-       if (!find (pathstr, must_exist, _file_is_new, _channel)) {
-               throw non_existent_source ();
-       }
-
-       if (_file_is_new && must_exist) {
-               return -1;
-       }
-
-       return 0;
+       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 += '%';
@@ -179,39 +157,39 @@ 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 */
-       
+
        str = broken_peak_path (audio_path);
-       
+
        if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
-               
-               if (is_embedded()) {
-                       
-                       /* it would be nice to rename it but the nature of 
+
+               if (!within_session()) {
+
+                       /* 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.
                */
-               
-               
-               str = old_peak_path (audio_path);       
+
+
+               str = old_peak_path (audio_path);
                if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
                        peak_path = str;
                }
@@ -220,21 +198,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);
@@ -243,10 +221,10 @@ AudioFileSource::old_peak_path (ustring audio_path)
 #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);
+       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;
 
@@ -254,17 +232,21 @@ 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)
 {
-#ifdef HAVE_COREAUDIO
-       if (CoreAudioSource::get_soundfile_info (path, _info, error_msg) == 0) {
+        /* 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;
        }
-#endif // HAVE_COREAUDIO
 
-       if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
+#ifdef HAVE_COREAUDIO
+       if (CoreAudioSource::get_soundfile_info (path, _info, error_msg) == 0) {
                return true;
        }
+#endif // HAVE_COREAUDIO
 
        return false;
 }
@@ -276,392 +258,60 @@ 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;
 }
 
 int
-AudioFileSource::set_state (const XMLNode& node)
+AudioFileSource::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
-
-       if (AudioSource::set_state (node)) {
+       if (Source::set_state (node, version)) {
                return -1;
        }
 
-       if ((prop = node.property (X_("channel"))) != 0) {
-               _channel = atoi (prop->value());
-       } else {
-               _channel = 0;
-       }
-
-       if ((prop = node.property (X_("name"))) != 0) {
-               _is_embedded = AudioFileSource::determine_embeddedness (prop->value());
-       } else {
-               _is_embedded = false;
+       if (AudioSource::set_state (node, version)) {
+               return -1;
        }
 
-       if ((prop = node.property (X_("destructive"))) != 0) {
-               /* old style, from the period when we had DestructiveFileSource */
-               _flags = Flag (_flags | Destructive);
+       if (FileSource::set_state (node, version)) {
+               return -1;
        }
 
        return 0;
 }
 
-void
-AudioFileSource::mark_for_remove ()
-{
-       // 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 | Removable | RemoveAtDestroy);
-}
-
 void
 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);
-
-       if (_peaks_built) {
-               PeaksReady (); /* EMIT SIGNAL */
-       }
-}
 
-void
-AudioFileSource::mark_take (ustring id)
-{
-       if (writable()) {
-               _take_id = id;
-       }
+       AudioSource::mark_streaming_write_completed ();
 }
 
 int
-AudioFileSource::move_to_trash (const ustring& trash_dir_name)
-{
-       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
-       */
-       
-       ustring newpath;
-       newpath = Glib::path_get_dirname (_path);
-       newpath = Glib::path_get_dirname (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) {
-               char buf[PATH_MAX+1];
-               int version = 1;
-               ustring newpath_v;
-
-               snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), version);
-               newpath_v = buf;
-
-               while (access (newpath_v.c_str(), F_OK) == 0 && version < 999) {
-                       snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), ++version);
-                       newpath_v = buf;
-               }
-               
-               if (version == 999) {
-                       PBD::error << string_compose (
-                                       _("there are already 1000 files with names like %1; versioning discontinued"),
-                                       newpath)
-                               << endmsg;
-               } else {
-                       newpath = newpath_v;
-               }
-       }
-
-       if (::rename (_path.c_str(), newpath.c_str()) != 0) {
-               PBD::error << string_compose (
-                               _("cannot rename audio file source from %1 to %2 (%3)"),
-                               _path, newpath, strerror (errno)) << endmsg;
-               return -1;
-       }
-
-       if (::unlink (peakpath.c_str()) != 0) {
-               error << string_compose (_("cannot remove peakfile %1 for %2 (%3)"),
-                                 peakpath, _path, strerror (errno))
-                     << endmsg;
-               /* try to back out */
-               rename (newpath.c_str(), _path.c_str());
-               return -1;
-       }
-           
-       _path = newpath;
-       peakpath = "";
-       
-       /* file can not be removed twice, since the operation is not idempotent */
-       _flags = Flag (_flags & ~(RemoveAtDestroy|Removable|RemovableIfEmpty));
-
-       return 0;
-}
-
-bool
-AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew, uint16_t& chan)
-{
-       ustring::size_type pos;
-       bool ret = false;
-
-       isnew = false;
-
-       if (pathstr[0] != '/') {
-
-               /* non-absolute pathname: find pathstr in search path */
-
-               vector<ustring> dirs;
-               int cnt;
-               ustring fullpath;
-               ustring keeppath;
-
-               if (search_path.length() == 0) {
-                       error << _("FileSource: search path not set") << endmsg;
-                       goto out;
-               }
-
-               split (search_path, dirs, ':');
-
-               cnt = 0;
-               
-               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 ((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) {
-
-                       error << string_compose (_("FileSource: \"%1\" is ambigous when searching %2\n\t"), pathstr, search_path) << endmsg;
-                       goto out;
-
-               } else if (cnt == 0) {
-
-                       if (must_exist) {
-                               error << string_compose(_("Filesource: cannot find required file (%1): while searching %2"), pathstr, search_path) << endmsg;
-                               goto out;
-                       } else {
-                               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;
-
-       } 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;
-
-               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;
-                       }
-                       
-                       if (errno != ENOENT) {
-                               error << string_compose(_("Filesource: cannot check for existing file (%1): %2"), _path, strerror (errno)) << endmsg;
-                               goto out;
-                       }
-                       
-                       /* a new file */
-
-                       isnew = true;
-                       ret = true;
-
-               } else {
-                       
-                       /* already exists */
-
-                       ret = true;
-
-               }
-       }
-       
-  out:
-       return ret;
-}
-
-void
-AudioFileSource::set_search_path (ustring p)
+AudioFileSource::move_dependents_to_trash()
 {
-       search_path = p;
+       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 ();
 }
 
-void
-AudioFileSource::set_timeline_position (int64_t pos)
-{
-       _timeline_position = pos;
-}
-
-void
-AudioFileSource::set_allow_remove_if_empty (bool yn)
-{
-       if (!writable()) {
-               return;
-       }
-
-       if (yn) {
-               _flags = Flag (_flags | RemovableIfEmpty);
-       } else {
-               _flags = Flag (_flags & ~RemovableIfEmpty);
-       }
-}
-
-int
-AudioFileSource::set_source_name (ustring newname, bool destructive)
-{
-       Glib::Mutex::Lock lm (_lock);
-       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 %1 to %2"), _name, newpath) << endmsg;
-               return -1;
-       }
-
-       _name = Glib::path_get_basename (newpath);
-       _path = newpath;
-
-       return rename_peakfile (peak_path (_path));
-}
-
 bool
-AudioFileSource::is_empty (Session& s, ustring path)
+AudioFileSource::is_empty (Session& /*s*/, string path)
 {
        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 false;
        }
 
        return info.length == 0;
@@ -671,38 +321,52 @@ int
 AudioFileSource::setup_peakfile ()
 {
        if (!(_flags & NoPeakFile)) {
-               return initialize_peakfile (_file_is_new, _path);
+               return initialize_peakfile (_path);
        } else {
                return 0;
        }
 }
 
 bool
-AudioFileSource::safe_file_extension(ustring file)
+AudioFileSource::safe_audio_file_extension(const string& file)
 {
        const char* suffixes[] = {
-               ".wav", ".WAV",
-               ".aiff", ".AIFF",
-               ".caf", ".CAF",
                ".aif", ".AIF",
+               ".aifc", ".AIFC",
+               ".aiff", ".AIFF",
                ".amb", ".AMB",
-               ".snd", ".SND",
                ".au", ".AU",
-               ".raw", ".RAW",
-               ".sf", ".SF",
+               ".caf", ".CAF",
                ".cdr", ".CDR",
+               ".flac", ".FLAC",
+               ".htk", ".HTK",
+               ".iff", ".IFF",
+               ".mat", ".MAT",
+               ".oga", ".OGA",
+               ".ogg", ".OGG",
+               ".paf", ".PAF",
+               ".pvf", ".PVF",
+               ".sf", ".SF",
                ".smp", ".SMP",
+               ".snd", ".SND",
                ".maud", ".MAUD",
+               ".voc", ".VOC"
                ".vwe", ".VWE",
-               ".paf", ".PAF",
-               ".voc", ".VOC",
-#ifdef HAVE_FLAC
-               ".flac", ".FLAC",
-#endif // HAVE_FLAC
+               ".w64", ".W64",
+               ".wav", ".WAV",
 #ifdef HAVE_COREAUDIO
-               ".mp3", ".MP3",
                ".aac", ".AAC",
+               ".adts", ".ADTS",
+               ".ac3", ".AC3",
+               ".amr", ".AMR",
+               ".mpa", ".MPA",
+               ".mpeg", ".MPEG",
+               ".mp1", ".MP1",
+               ".mp2", ".MP2",
+               ".mp3", ".MP3",
                ".mp4", ".MP4",
+               ".m4a", ".M4A",
+               ".sd2", ".SD2",         // libsndfile supports sd2 also, but the resource fork is required to open.
 #endif // HAVE_COREAUDIO
        };
 
@@ -715,21 +379,8 @@ AudioFileSource::safe_file_extension(ustring file)
        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)
+AudioFileSource::get_interleave_buffer (framecnt_t size)
 {
        SizedSampleBuffer* ssb;