X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=297c02e418dba264c2795be1a9abe808810302e8;hb=7720d0d109ca47c2a0a23883d5831de1ff32005d;hp=d1371ad0fb831120c014529d3bc0f6485162c1d2;hpb=022818b4a796f52c0a91eea42e65aec0bc7bed43;p=ardour.git diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index d1371ad0fb..297c02e418 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 @@ -17,6 +17,10 @@ */ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include #include @@ -26,13 +30,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#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 @@ -40,31 +44,33 @@ #include #include -#include -#include -#include -#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 // the parser throws ObjC++ errors. (nil is a keyword) -#ifdef HAVE_COREAUDIO -#include +#ifdef HAVE_COREAUDIO +#include "ardour/coreaudiosource.h" #include #include #endif // HAVE_COREAUDIO #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Glib; ustring AudioFileSource::peak_dir = ""; -sigc::signal AudioFileSource::HeaderPositionOffsetChanged; +PBD::Signal0 AudioFileSource::HeaderPositionOffsetChanged; uint64_t AudioFileSource::header_position_offset = 0; /* XXX maybe this too */ @@ -74,7 +80,7 @@ struct SizedSampleBuffer { nframes_t size; Sample* buf; - SizedSampleBuffer (nframes_t sz) : size (sz) { + SizedSampleBuffer (nframes_t sz) : size (sz) { buf = new Sample[size]; } @@ -86,47 +92,47 @@ struct SizedSampleBuffer { 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) +AudioFileSource::AudioFileSource (Session& s, const ustring& path, Source::Flag flags) : Source (s, DataType::AUDIO, path, flags) , AudioSource (s, path) - , FileSource (s, DataType::AUDIO, path, embedded, flags) + , FileSource (s, DataType::AUDIO, path, flags) { - if (init (path, true)) { + if (init (_path, true)) { throw failed_constructor (); } + } /** 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 ustring& path, 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, flags) { - _is_embedded = false; - - 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()); @@ -158,33 +164,33 @@ AudioFileSource::find_broken_peakfile (ustring peak_path, ustring audio_path) ustring 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; } @@ -253,17 +259,17 @@ AudioFileSource::get_state () } 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; } @@ -276,7 +282,7 @@ 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. */ @@ -302,14 +308,14 @@ AudioFileSource::set_header_position_offset (nframes_t offset) } bool -AudioFileSource::is_empty (Session& s, ustring path) +AudioFileSource::is_empty (Session& /*s*/, ustring 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; @@ -344,9 +350,8 @@ AudioFileSource::safe_audio_file_extension(const ustring& file) ".vwe", ".VWE", ".paf", ".PAF", ".voc", ".VOC", -#ifdef HAVE_FLAC + ".ogg", ".OGG", ".flac", ".FLAC", -#endif // HAVE_FLAC #ifdef HAVE_COREAUDIO ".mp3", ".MP3", ".aac", ".AAC",