X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsource_factory.cc;h=999ae667dd1a8c8e44393e2b56f778c9119205ea;hb=1e424e11460812262df89c08c6af521a935760cf;hp=6ecd79844dd95c6d6f69a976b1c354d57280c6e5;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 6ecd79844d..999ae667dd 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-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 @@ -18,17 +18,32 @@ $Id$ */ -#include +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif -#include -#include -#include -#include +#include "pbd/boost_debug.h" +#include "pbd/error.h" +#include "pbd/convert.h" +#include "pbd/pthread_utils.h" +#include "pbd/stacktrace.h" + +#include "ardour/source_factory.h" +#include "ardour/sndfilesource.h" +#include "ardour/silentfilesource.h" +#include "ardour/rc_configuration.h" +#include "ardour/smf_source.h" +#include "ardour/session.h" + +#ifdef HAVE_COREAUDIO +#define USE_COREAUDIO_FOR_FILES +#endif -#ifdef HAVE_COREAUDIO -#include +#ifdef USE_COREAUDIO_FOR_FILES +#include "ardour/coreaudiosource.h" #endif + #include "i18n.h" using namespace ARDOUR; @@ -36,15 +51,69 @@ using namespace std; using namespace PBD; sigc::signal > SourceFactory::SourceCreated; +Glib::Cond* SourceFactory::PeaksToBuild; +Glib::StaticMutex SourceFactory::peak_building_lock = GLIBMM_STATIC_MUTEX_INIT; +std::list > SourceFactory::files_with_peaks; + +static void +peak_thread_work () +{ + PBD::notify_gui_about_thread_creation (pthread_self(), string ("peakbuilder-") + to_string (pthread_self(), std::dec)); + + while (true) { + + SourceFactory::peak_building_lock.lock (); + + wait: + if (SourceFactory::files_with_peaks.empty()) { + SourceFactory::PeaksToBuild->wait (SourceFactory::peak_building_lock); + } + + if (SourceFactory::files_with_peaks.empty()) { + goto wait; + } + + boost::shared_ptr as (SourceFactory::files_with_peaks.front().lock()); + SourceFactory::files_with_peaks.pop_front (); + SourceFactory::peak_building_lock.unlock (); + + if (!as) { + continue; + } + + as->setup_peakfile (); + } +} + +void +SourceFactory::init () +{ + PeaksToBuild = new Glib::Cond(); + + for (int n = 0; n < 2; ++n) { + Glib::Thread::create (sigc::ptr_fun (::peak_thread_work), false); + } +} int -SourceFactory::setup_peakfile (boost::shared_ptr s) +SourceFactory::setup_peakfile (boost::shared_ptr s, bool async) { boost::shared_ptr as (boost::dynamic_pointer_cast (s)); + if (as) { - if (as->setup_peakfile ()) { - error << string_compose("SourceFactory: could not set up peakfile for %1", as->name()) << endmsg; - return -1; + + if (async) { + + Glib::Mutex::Lock lm (peak_building_lock); + files_with_peaks.push_back (boost::weak_ptr (as)); + PeaksToBuild->broadcast (); + + } else { + + if (as->setup_peakfile ()) { + error << string_compose("SourceFactory: could not set up peakfile for %1", as->name()) << endmsg; + return -1; + } } } @@ -54,33 +123,66 @@ SourceFactory::setup_peakfile (boost::shared_ptr s) boost::shared_ptr SourceFactory::createSilent (Session& s, const XMLNode& node, nframes_t nframes, float sr) { - boost::shared_ptr ret (new SilentFileSource (s, node, nframes, sr)); + Source* src = new SilentFileSource (s, node, nframes, sr); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); + // no analysis data - the file is non-existent SourceCreated (ret); return ret; } -#ifdef HAVE_COREAUDIO boost::shared_ptr -SourceFactory::create (Session& s, const XMLNode& node) +SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) { - try { - boost::shared_ptr ret (new CoreAudioSource (s, node)); - if (setup_peakfile (ret)) { - return boost::shared_ptr(); + DataType type = DataType::AUDIO; + const XMLProperty* prop = node.property("type"); + + if (prop) { + type = DataType (prop->value()); + } + + if (type == DataType::AUDIO) { + + try { + + Source* src = new SndFileSource (s, node); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); + if (setup_peakfile (ret, defer_peaks)) { + return boost::shared_ptr(); + } + ret->check_for_analysis_data_on_disk (); + SourceCreated (ret); + return ret; } - SourceCreated (ret); - return ret; - } + catch (failed_constructor& err) { + +#ifdef USE_COREAUDIO_FOR_FILES - catch (failed_constructor& err) { + /* this is allowed to throw */ - /* this is allowed to throw */ + Source *s = new CoreAudioSource (s, node); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); - boost::shared_ptr ret (new SndFileSource (s, node)); - if (setup_peakfile (ret)) { - return boost::shared_ptr(); + if (setup_peakfile (ret, defer_peaks)) { + return boost::shared_ptr(); + } + + ret->check_for_analysis_data_on_disk (); + SourceCreated (ret); + return ret; +#else + throw; // rethrow +#endif } + + } else if (type == DataType::MIDI) { + Source* src = new SMFSource (s, node); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); + ret->check_for_analysis_data_on_disk (); SourceCreated (ret); return ret; } @@ -88,109 +190,115 @@ SourceFactory::create (Session& s, const XMLNode& node) return boost::shared_ptr(); } -#else - boost::shared_ptr -SourceFactory::create (Session& s, const XMLNode& node) +SourceFactory::createReadable (DataType type, Session& s, const string& path, bool embedded, + int chn, Source::Flag flags, bool announce, bool defer_peaks) { - /* this is allowed to throw */ + if (type == DataType::AUDIO) { - boost::shared_ptr ret (new SndFileSource (s, node)); - - if (setup_peakfile (ret)) { - return boost::shared_ptr(); - } - - SourceCreated (ret); - return ret; -} + if (!(flags & Destructive)) { -#endif // HAVE_COREAUDIO + try { -#ifdef HAVE_COREAUDIO -boost::shared_ptr -SourceFactory::createReadable (Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce) -{ - if (!(flags & Destructive)) { + Source* src = new SndFileSource (s, path, embedded, chn, flags); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); + + if (setup_peakfile (ret, defer_peaks)) { + return boost::shared_ptr(); + } - try { - boost::shared_ptr ret (new CoreAudioSource (s, path, chn, flags)); - if (setup_peakfile (ret)) { - return boost::shared_ptr(); + ret->check_for_analysis_data_on_disk (); + if (announce) { + SourceCreated (ret); + } + return ret; } - if (announce) { - SourceCreated (ret); - } - return ret; - } - - catch (failed_constructor& err) { - /* this is allowed to throw */ + catch (failed_constructor& err) { +#ifdef USE_COREAUDIO_FOR_FILES + + Source* src = new CoreAudioSource (s, path, embedded, chn, flags); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); + if (setup_peakfile (ret, defer_peaks)) { + return boost::shared_ptr(); + } + ret->check_for_analysis_data_on_disk (); + if (announce) { + SourceCreated (ret); + } + return ret; - boost::shared_ptr ret (new SndFileSource (s, path, chn, flags)); - if (setup_peakfile (ret)) { - return boost::shared_ptr(); - } - if (announce) { - SourceCreated (ret); +#else + throw; // rethrow +#endif } - return ret; + + } else { + // eh? } - } else { + } else if (type == DataType::MIDI) { + + Source* src = new SMFSource (s, path, embedded, SMFSource::Flag(0)); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); - boost::shared_ptr ret (new SndFileSource (s, path, chn, flags)); - if (setup_peakfile (ret)) { - return boost::shared_ptr(); - } if (announce) { SourceCreated (ret); } + return ret; + } return boost::shared_ptr(); } -#else - boost::shared_ptr -SourceFactory::createReadable (Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce) +SourceFactory::createWritable (DataType type, Session& s, const std::string& path, bool embedded, + bool destructive, nframes_t rate, bool announce, bool defer_peaks) { - boost::shared_ptr ret (new SndFileSource (s, path, chn, flags)); + /* this might throw failed_constructor(), which is OK */ - if (setup_peakfile (ret)) { - return boost::shared_ptr(); - } + if (type == DataType::AUDIO) { + Source* src = new SndFileSource (s, path, embedded, + s.config.get_native_file_data_format(), + s.config.get_native_file_header_format(), + rate, + (destructive + ? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive) + : SndFileSource::default_writable_flags)); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); + + if (setup_peakfile (ret, defer_peaks)) { + return boost::shared_ptr(); + } - if (announce) { - SourceCreated (ret); - } + // no analysis data - this is a new file - return ret; -} + if (announce) { + SourceCreated (ret); + } + return ret; -#endif // HAVE_COREAUDIO + } else if (type == DataType::MIDI) { -boost::shared_ptr -SourceFactory::createWritable (Session& s, std::string path, bool destructive, nframes_t rate, bool announce) -{ - /* this might throw failed_constructor(), which is OK */ + Source* src = new SMFSource (s, path, embedded, Source::Flag(0)); + // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); + boost::shared_ptr ret (src); - boost::shared_ptr ret (new SndFileSource - (s, path, - Config->get_native_file_data_format(), - Config->get_native_file_header_format(), - rate, - (destructive ? AudioFileSource::Flag (SndFileSource::default_writable_flags | AudioFileSource::Destructive) : - SndFileSource::default_writable_flags))); + // no analysis data - this is a new file + + if (announce) { + SourceCreated (ret); + } + return ret; - if (setup_peakfile (ret)) { - return boost::shared_ptr(); - } - if (announce) { - SourceCreated (ret); } - return ret; + + return boost::shared_ptr (); } +