X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=2486d45ca1c21cd13983af534a4ea540fb2a9e2d;hb=91ff55bd89d44bf6d9ec222ac531f71f5700a91b;hp=1500b139acdff2edf26c3b34e5428b2fa040d1e2;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 1500b139ac..2486d45ca1 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -42,15 +42,12 @@ #include #include -#include +#include #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 @@ -68,48 +65,52 @@ using namespace ARDOUR; using namespace PBD; using namespace Glib; -ustring AudioFileSource::peak_dir = ""; +string AudioFileSource::peak_dir = ""; -boost::signals2::signal AudioFileSource::HeaderPositionOffsetChanged; -uint64_t AudioFileSource::header_position_offset = 0; +PBD::Signal0 AudioFileSource::HeaderPositionOffsetChanged; +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 thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT; +Glib::Threads::Private thread_interleave_buffer; -/** 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 (); } - } /** 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 (); } @@ -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 (); } @@ -140,16 +141,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 +158,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 +199,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); @@ -222,10 +222,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; @@ -233,17 +233,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; } @@ -255,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; } @@ -283,15 +288,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 @@ -301,14 +298,14 @@ 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 (); } bool -AudioFileSource::is_empty (Session& /*s*/, ustring path) +AudioFileSource::is_empty (Session& /*s*/, string path) { SoundFileInfo info; string err; @@ -332,30 +329,45 @@ AudioFileSource::setup_peakfile () } bool -AudioFileSource::safe_audio_file_extension(const 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", - ".ogg", ".OGG", - ".flac", ".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 }; @@ -369,7 +381,7 @@ AudioFileSource::safe_audio_file_extension(const ustring& file) } Sample* -AudioFileSource::get_interleave_buffer (nframes_t size) +AudioFileSource::get_interleave_buffer (framecnt_t size) { SizedSampleBuffer* ssb;