X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fsource_factory.cc;h=834014bd1f9874d712b3f57fa9a17d4072393d56;hp=65f9d8da28144261ad5bbd959ae89af92acd5087;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=4aeebb914eedf9279e4904786ce42518611de137 diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 65f9d8da28..834014bd1f 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -22,7 +22,6 @@ #include "libardour-config.h" #endif -#include "pbd/boost_debug.h" #include "pbd/error.h" #include "pbd/convert.h" #include "pbd/pthread_utils.h" @@ -30,12 +29,13 @@ #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" @@ -44,17 +44,19 @@ #endif -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace std; using namespace PBD; PBD::Signal1 > SourceFactory::SourceCreated; -Glib::Cond* SourceFactory::PeaksToBuild; -Glib::StaticMutex SourceFactory::peak_building_lock = GLIBMM_STATIC_MUTEX_INIT; +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 () { @@ -66,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()) { @@ -75,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) { @@ -82,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)); } } @@ -102,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 { @@ -137,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()); @@ -151,7 +164,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) try { boost::shared_ptr ap (new AudioPlaylistSource (s, node)); - + if (setup_peakfile (ap, true)) { return boost::shared_ptr(); } @@ -208,7 +221,8 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) } } else if (type == DataType::MIDI) { boost::shared_ptr src (new SMFSource (s, node)); - src->load_model (true, true); + 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 @@ -221,7 +235,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) } 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) { @@ -275,18 +289,18 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, } else if (type == DataType::MIDI) { - SMFSource* src = new SMFSource (s, path, SMFSource::Flag(0)); - src->load_model (true, true); + 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 - boost::shared_ptr ret (src); if (announce) { - SourceCreated (ret); + SourceCreated (src); } - return ret; + return src; } @@ -294,19 +308,19 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, } boost::shared_ptr -SourceFactory::createWritable (DataType type, Session& s, const std::string& path, const std::string& origin, +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, origin, - 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)); + 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 @@ -328,7 +342,8 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat boost::shared_ptr src (new SMFSource (s, path, SndFileSource::default_writable_flags)); assert (src->writable ()); - src->load_model (true, true); + 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 @@ -345,6 +360,39 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat 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)