X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsource_factory.cc;h=4b4a3cba33301cc0c7b878b9621e1531ef7018e5;hb=6584a89c4eb5024fe89a15acd8e4fa4697e606be;hp=a0aa24a2d066954ca973359e1632958f62fbd85e;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index a0aa24a2d0..4b4a3cba33 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -22,23 +22,23 @@ #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/midi_playlist.h" +#include "ardour/midi_playlist_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 @@ -49,15 +49,15 @@ 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 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) { @@ -65,7 +65,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()) { @@ -87,10 +87,8 @@ peak_thread_work () 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,9 +101,9 @@ SourceFactory::setup_peakfile (boost::shared_ptr s, bool async) if (async) { - 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 { @@ -120,9 +118,13 @@ 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) { - boost::shared_ptr ret (new SilentFileSource (s, node, nframes, sr)); + Source* src = new SilentFileSource (s, node, nframes, sr); +#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); return ret; @@ -134,66 +136,103 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) DataType type = DataType::AUDIO; const XMLProperty* prop = node.property("type"); - if (!prop) { - return boost::shared_ptr(); + if (prop) { + type = DataType (prop->value()); } - type = DataType (prop->value()); - if (type == DataType::AUDIO) { - try { + /* it could be nested */ - boost::shared_ptr ret (new SndFileSource (s, node)); - 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)); + + if (setup_peakfile (ap, true)) { + return boost::shared_ptr(); + } + + ap->check_for_analysis_data_on_disk (); + + SourceCreated (ap); + return ap; -#ifdef USE_COREAUDIO_FOR_FILES + } catch (failed_constructor&) { + /* oh well, so much for that then ... */ + } - /* this is allowed to throw */ + } else { - boost::shared_ptr ret (new CoreAudioSource (s, node)); - if (setup_peakfile (ret, defer_peaks)) { - return boost::shared_ptr(); + 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; } - 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) { - boost::shared_ptr ret (new SMFSource (s, node)); - 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, bool embedded, - int chn, Source::Flag flags, bool announce, bool defer_peaks) +SourceFactory::createExternal (DataType type, Session& s, const string& path, + int chn, Source::Flag flags, bool announce, bool defer_peaks) { if (type == DataType::AUDIO) { - + if (!(flags & Destructive)) { try { - boost::shared_ptr ret (new SndFileSource (s, path, embedded, chn, flags)); + Source* src = new SndFileSource (s, path, chn, 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)) { return boost::shared_ptr(); @@ -207,9 +246,13 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo } catch (failed_constructor& err) { -#ifdef USE_COREAUDIO_FOR_FILES +#ifdef HAVE_COREAUDIO - boost::shared_ptr ret (new CoreAudioSource (s, path, embedded, chn, flags)); + Source* src = new CoreAudioSource (s, path, chn, 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)) { return boost::shared_ptr(); } @@ -230,13 +273,18 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo } else if (type == DataType::MIDI) { - boost::shared_ptr ret (new SMFSource (s, path, embedded, SMFSource::Flag(0))); + 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; } @@ -244,19 +292,23 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo } boost::shared_ptr -SourceFactory::createWritable (DataType type, Session& s, const std::string& path, bool embedded, - 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) { - boost::shared_ptr ret (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))); + 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)) { return boost::shared_ptr(); @@ -270,18 +322,121 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat return ret; } else if (type == DataType::MIDI) { - - boost::shared_ptr ret (new SMFSource (s, path, embedded, Source::Flag(0))); + // 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(); +} +