#include "libardour-config.h"
#endif
-#include "pbd/boost_debug.h"
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/pthread_utils.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"
#endif
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace std;
Glib::Threads::Mutex SourceFactory::peak_building_lock;
std::list<boost::weak_ptr<AudioSource> > SourceFactory::files_with_peaks;
+static int active_threads = 0;
+
static void
peak_thread_work ()
{
boost::shared_ptr<AudioSource> as (SourceFactory::files_with_peaks.front().lock());
SourceFactory::files_with_peaks.pop_front ();
+ ++active_threads;
SourceFactory::peak_building_lock.unlock ();
if (!as) {
}
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 ()
{
if (as) {
- if (async) {
+ // immediately set 'peakfile-path' for empty and NoPeakFile sources
+ if (async && !as->empty() && !(as->flags() & Source::NoPeakFile)) {
Glib::Threads::Mutex::Lock lm (peak_building_lock);
files_with_peaks.push_back (boost::weak_ptr<AudioSource> (as));
}
boost::shared_ptr<Source>
-SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr)
+SourceFactory::createSilent (Session& s, const XMLNode& node, samplecnt_t nframes, float sr)
{
Source* src = new SilentFileSource (s, node, nframes, sr);
#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
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());
try {
boost::shared_ptr<AudioPlaylistSource> ap (new AudioPlaylistSource (s, node));
-
+
if (setup_peakfile (ap, true)) {
return boost::shared_ptr<Source>();
}
}
}
} else if (type == DataType::MIDI) {
- boost::shared_ptr<SMFSource> src (new SMFSource (s, node));
- src->load_model (true, true);
+ try {
+ boost::shared_ptr<SMFSource> 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");
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
- src->check_for_analysis_data_on_disk ();
- SourceCreated (src);
- return src;
+ src->check_for_analysis_data_on_disk ();
+ SourceCreated (src);
+ return src;
+ } catch (...) {
+ }
}
return boost::shared_ptr<Source>();
int chn, Source::Flag flags, bool announce, bool defer_peaks)
{
if (type == DataType::AUDIO) {
-
+
if (!(flags & Destructive)) {
try {
} else if (type == DataType::MIDI) {
- boost::shared_ptr<SMFSource> src (new SMFSource (s, path));
- src->load_model (true, true);
+ try {
+ boost::shared_ptr<SMFSource> 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");
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
- if (announce) {
- SourceCreated (src);
- }
+ if (announce) {
+ SourceCreated (src);
+ }
- return src;
+ return src;
+ } catch (...) {
+ }
}
}
boost::shared_ptr<Source>
-SourceFactory::createWritable (DataType type, Session& s, const std::string& path,
- bool destructive, framecnt_t rate, bool announce, bool defer_peaks)
+SourceFactory::createWritable (DataType type, Session& s, const std::string& path,
+ bool destructive, samplecnt_t rate, bool announce, bool defer_peaks)
{
/* this might throw failed_constructor(), which is OK */
} else if (type == DataType::MIDI) {
// XXX writable flags should belong to MidiSource too
- boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags));
- assert (src->writable ());
+ try {
+ boost::shared_ptr<SMFSource> 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");
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
#endif
- // no analysis data - this is a new file
+ // no analysis data - this is a new file
- if (announce) {
- SourceCreated (src);
- }
- return src;
+ if (announce) {
+ SourceCreated (src);
+ }
+ return src;
+
+ } catch (...) {
+ }
}
return boost::shared_ptr<Source> ();
boost::shared_ptr<Source>
SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr<Playlist> p, const PBD::ID& orig, const std::string& name,
- uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks)
+ uint32_t chn, sampleoffset_t start, samplecnt_t len, bool copy, bool defer_peaks)
{
if (type == DataType::AUDIO) {
try {
return boost::shared_ptr<Source>();
}
-