X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=63f7b55016455d7a02a9a862e2b65c81b8c49c16;hb=78310ad79206939c99a78f8d6d97c1fb919edf03;hp=f1a65edc63645d9ff41d4e5eef3b2ea4b398512e;hpb=88beef2e93d26d28467fe151f5ef2972d0ca9169;p=ardour.git diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index f1a65edc63..63f7b55016 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -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 @@ -45,6 +45,7 @@ #include #include "ardour/audiofilesource.h" +#include "ardour/debug.h" #include "ardour/sndfile_helpers.h" #include "ardour/sndfilesource.h" #include "ardour/session.h" @@ -54,7 +55,7 @@ // if these headers come before sigc++ is included // the parser throws ObjC++ errors. (nil is a keyword) -#ifdef HAVE_COREAUDIO +#ifdef HAVE_COREAUDIO #include "ardour/coreaudiosource.h" #include #include @@ -67,71 +68,76 @@ using namespace ARDOUR; using namespace PBD; using namespace Glib; -ustring AudioFileSource::peak_dir = ""; +string AudioFileSource::peak_dir = ""; -sigc::signal AudioFileSource::HeaderPositionOffsetChanged; +PBD::Signal0 AudioFileSource::HeaderPositionOffsetChanged; uint64_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; -/** Constructor used for existing internal-to-session files. */ -AudioFileSource::AudioFileSource (Session& s, const ustring& path, bool embedded, 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, embedded, flags) + /* note that external files have their own path as "origin" */ + , FileSource (s, DataType::AUDIO, path, path, flags) { - if (init (path, true)) { + /* 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, bool embedded, Source::Flag flags, - SampleFormat samp_format, HeaderFormat hdr_format) +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, embedded, flags) + , 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) : 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 (); } - - if (init (_name, 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()); @@ -139,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 += '%'; @@ -157,39 +162,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; } @@ -198,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); @@ -221,10 +226,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; @@ -232,18 +237,22 @@ 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. + */ + + 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; } #endif // HAVE_COREAUDIO - if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) { - return true; - } - return false; } @@ -254,21 +263,22 @@ 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) { - if (Source::set_state (node)) { + if (Source::set_state (node, version)) { return -1; } - if (AudioSource::set_state (node)) { + if (AudioSource::set_state (node, version)) { return -1; } - - if (FileSource::set_state (node)) { + + if (FileSource::set_state (node, version)) { return -1; } @@ -281,16 +291,8 @@ 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 */ - } + AudioSource::mark_streaming_write_completed (); } int @@ -300,21 +302,21 @@ 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; - + 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; @@ -331,35 +333,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", -#ifdef HAVE_OGG - ".ogg", ".OGG", -#endif /* HAVE_OGG */ -#ifdef HAVE_FLAC - ".flac", ".FLAC", -#else -#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 }; @@ -373,7 +385,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;