X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsource_factory.cc;h=db7faeddf16746726fa8ceebbdd3cd27b59b6412;hb=e845b9f9357c4ff471c02b1f63a61275bb4a7d28;hp=7c8943a4f1e6f6499cd159c1d44ed3fafca782f1;hpb=3fdcba185980896366cc0d3d14f6dfd6bbaf1d0a;p=ardour.git diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 7c8943a4f1..db7faeddf1 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -22,24 +22,24 @@ #include "libardour-config.h" #endif -#include "pbd/boost_debug.h" #include "pbd/error.h" #include "pbd/convert.h" #include "pbd/pthread_utils.h" #include "pbd/stacktrace.h" +#include "ardour/audioplaylist.h" +#include "ardour/audio_playlist_source.h" +#include "ardour/boost_debug.h" +#include "ardour/midi_playlist.h" +#include "ardour/midi_playlist_source.h" +#include "ardour/source.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 USE_COREAUDIO_FOR_FILES #include "ardour/coreaudiosource.h" #endif @@ -50,15 +50,16 @@ using namespace ARDOUR; using namespace std; using namespace PBD; -sigc::signal > SourceFactory::SourceCreated; -Glib::Cond* SourceFactory::PeaksToBuild; -Glib::StaticMutex SourceFactory::peak_building_lock = GLIBMM_STATIC_MUTEX_INIT; +PBD::Signal1 > SourceFactory::SourceCreated; +Glib::Threads::Cond SourceFactory::PeaksToBuild; +Glib::Threads::Mutex SourceFactory::peak_building_lock; std::list > SourceFactory::files_with_peaks; +static int active_threads = 0; + static void peak_thread_work () { - PBD::notify_gui_about_thread_creation (pthread_self(), string ("peakbuilder-") + to_string (pthread_self(), std::dec)); SessionEvent::create_per_thread_pool (X_("PeakFile Builder "), 64); while (true) { @@ -67,7 +68,7 @@ peak_thread_work () wait: if (SourceFactory::files_with_peaks.empty()) { - SourceFactory::PeaksToBuild->wait (SourceFactory::peak_building_lock); + SourceFactory::PeaksToBuild.wait (SourceFactory::peak_building_lock); } if (SourceFactory::files_with_peaks.empty()) { @@ -76,6 +77,7 @@ peak_thread_work () boost::shared_ptr as (SourceFactory::files_with_peaks.front().lock()); SourceFactory::files_with_peaks.pop_front (); + ++active_threads; SourceFactory::peak_building_lock.unlock (); if (!as) { @@ -83,16 +85,25 @@ peak_thread_work () } as->setup_peakfile (); + SourceFactory::peak_building_lock.lock (); + --active_threads; + SourceFactory::peak_building_lock.unlock (); } } +int +SourceFactory::peak_work_queue_length () +{ + // ideally we'd loop over the queue and check for duplicates + // and existing valid peak-files.. + return SourceFactory::files_with_peaks.size () + active_threads; +} + void SourceFactory::init () { - PeaksToBuild = new Glib::Cond(); - for (int n = 0; n < 2; ++n) { - Glib::Thread::create (sigc::ptr_fun (::peak_thread_work), false); + Glib::Threads::Thread::create (sigc::ptr_fun (::peak_thread_work)); } } @@ -103,11 +114,12 @@ SourceFactory::setup_peakfile (boost::shared_ptr s, bool async) if (as) { - if (async) { + // immediately set 'peakfile-path' for empty and NoPeakFile sources + if (async && !as->empty() && !(as->flags() & Source::NoPeakFile)) { - Glib::Mutex::Lock lm (peak_building_lock); + Glib::Threads::Mutex::Lock lm (peak_building_lock); files_with_peaks.push_back (boost::weak_ptr (as)); - PeaksToBuild->broadcast (); + PeaksToBuild.broadcast (); } else { @@ -122,10 +134,12 @@ SourceFactory::setup_peakfile (boost::shared_ptr s, bool async) } boost::shared_ptr -SourceFactory::createSilent (Session& s, const XMLNode& node, nframes_t nframes, float sr) +SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr) { Source* src = new SilentFileSource (s, node, nframes, sr); - // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr ret (src); // no analysis data - the file is non-existent SourceCreated (ret); @@ -136,7 +150,7 @@ boost::shared_ptr SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) { DataType type = DataType::AUDIO; - const XMLProperty* prop = node.property("type"); + XMLProperty const * prop = node.property("type"); if (prop) { type = DataType (prop->value()); @@ -144,55 +158,84 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) if (type == DataType::AUDIO) { - try { + /* it could be nested */ - 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; - } + if (node.property ("playlist") != 0) { - catch (failed_constructor& err) { + try { + boost::shared_ptr ap (new AudioPlaylistSource (s, node)); -#ifdef USE_COREAUDIO_FOR_FILES + if (setup_peakfile (ap, true)) { + return boost::shared_ptr(); + } - /* this is allowed to throw */ + ap->check_for_analysis_data_on_disk (); - Source *src = new CoreAudioSource (s, node); - // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); - boost::shared_ptr ret (src); + SourceCreated (ap); + return ap; - if (setup_peakfile (ret, defer_peaks)) { - return boost::shared_ptr(); + } catch (failed_constructor&) { + /* oh well, so much for that then ... */ } - ret->check_for_analysis_data_on_disk (); - SourceCreated (ret); - return ret; + } else { + + + try { + Source* src = new SndFileSource (s, node); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif + 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; + } + + catch (failed_constructor& err) { + +#ifdef HAVE_COREAUDIO + + /* this is allowed to throw */ + + Source *src = new CoreAudioSource (s, node); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif + 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; #else - throw; // rethrow + 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; + boost::shared_ptr src (new SMFSource (s, node)); + Source::Lock lock(src->mutex()); + src->load_model (lock, true); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif + src->check_for_analysis_data_on_disk (); + SourceCreated (src); + return src; } return boost::shared_ptr(); } boost::shared_ptr -SourceFactory::createReadable (DataType type, Session& s, const string& path, +SourceFactory::createExternal (DataType type, Session& s, const string& path, int chn, Source::Flag flags, bool announce, bool defer_peaks) { if (type == DataType::AUDIO) { @@ -202,9 +245,11 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, try { Source* src = new SndFileSource (s, path, chn, flags); - // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr ret (src); - + if (setup_peakfile (ret, defer_peaks)) { return boost::shared_ptr(); } @@ -217,10 +262,12 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, } catch (failed_constructor& err) { -#ifdef USE_COREAUDIO_FOR_FILES +#ifdef HAVE_COREAUDIO Source* src = new CoreAudioSource (s, path, chn, flags); - // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr ret (src); if (setup_peakfile (ret, defer_peaks)) { return boost::shared_ptr(); @@ -241,16 +288,19 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, } } else if (type == DataType::MIDI) { - - Source* src = new SMFSource (s, path, SMFSource::Flag(0)); - // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); - boost::shared_ptr ret (src); + + boost::shared_ptr src (new SMFSource (s, path)); + Source::Lock lock(src->mutex()); + src->load_model (lock, true); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif if (announce) { - SourceCreated (ret); + SourceCreated (src); } - return ret; + return src; } @@ -258,20 +308,22 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, } boost::shared_ptr -SourceFactory::createWritable (DataType type, Session& s, const std::string& path, - bool destructive, nframes_t rate, bool announce, bool defer_peaks) +SourceFactory::createWritable (DataType type, Session& s, const std::string& path, + bool destructive, framecnt_t rate, bool announce, bool defer_peaks) { /* this might throw failed_constructor(), which is OK */ if (type == DataType::AUDIO) { - Source* src = new SndFileSource (s, path, - 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()); + Source* src = new SndFileSource (s, path, string(), + 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)); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif boost::shared_ptr ret (src); if (setup_peakfile (ret, defer_peaks)) { @@ -286,20 +338,121 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat return ret; } else if (type == DataType::MIDI) { - - Source* src = new SMFSource (s, path, Source::Flag(0)); - // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name()); - boost::shared_ptr ret (src); + // XXX writable flags should belong to MidiSource too + boost::shared_ptr src (new SMFSource (s, path, SndFileSource::default_writable_flags)); + assert (src->writable ()); + + Source::Lock lock(src->mutex()); + src->load_model (lock, true); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif // no analysis data - this is a new file if (announce) { - SourceCreated (ret); + SourceCreated (src); + } + return src; + + } + + return boost::shared_ptr (); +} + +boost::shared_ptr +SourceFactory::createForRecovery (DataType type, Session& s, const std::string& path, int chn) +{ + /* this might throw failed_constructor(), which is OK */ + + if (type == DataType::AUDIO) { + Source* src = new SndFileSource (s, path, chn); + +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (src, "Source"); +#endif + boost::shared_ptr ret (src); + + if (setup_peakfile (ret, false)) { + return boost::shared_ptr(); } + + // no analysis data - this is still basically a new file (we + // crashed while recording. + + // always announce these files + + SourceCreated (ret); + return ret; + } else if (type == DataType::MIDI) { + error << _("Recovery attempted on a MIDI file - not implemented") << endmsg; } return boost::shared_ptr (); } +boost::shared_ptr +SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr p, const PBD::ID& orig, const std::string& name, + uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks) +{ + if (type == DataType::AUDIO) { + try { + + boost::shared_ptr ap = boost::dynamic_pointer_cast(p); + + if (ap) { + + if (copy) { + ap.reset (new AudioPlaylist (ap, start, len, name, true)); + start = 0; + } + + Source* src = new AudioPlaylistSource (s, orig, name, ap, chn, start, len, Source::Flag (0)); + 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; + } + } + + catch (failed_constructor& err) { + /* relax - return at function scope */ + } + + } else if (type == DataType::MIDI) { + + try { + + boost::shared_ptr ap = boost::dynamic_pointer_cast(p); + + if (ap) { + + if (copy) { + ap.reset (new MidiPlaylist (ap, start, len, name, true)); + start = 0; + } + + Source* src = new MidiPlaylistSource (s, orig, name, ap, chn, start, len, Source::Flag (0)); + boost::shared_ptr ret (src); + + SourceCreated (ret); + return ret; + } + } + + catch (failed_constructor& err) { + /* relax - return at function scope */ + } + + } + + return boost::shared_ptr(); +} +