#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"
-#include "ardour/rc_configuration.h"
#include "ardour/smf_source.h"
#include "ardour/session.h"
#endif
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace std;
using namespace PBD;
PBD::Signal1<void,boost::shared_ptr<Source> > 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<boost::weak_ptr<AudioSource> > SourceFactory::files_with_peaks;
+static int active_threads = 0;
+
static void
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()) {
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 ()
{
- 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));
}
}
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<AudioSource> (as));
- PeaksToBuild->broadcast ();
+ PeaksToBuild.broadcast ();
} else {
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);
+ 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<Source>
-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) {
} else if (type == DataType::MIDI) {
- SMFSource* src = new SMFSource (s, path, SMFSource::Flag(0));
- src->load_model (true, true);
+ 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");
#endif
- boost::shared_ptr<Source> ret (src);
if (announce) {
- SourceCreated (ret);
+ SourceCreated (src);
}
- return ret;
+ return src;
}
}
boost::shared_ptr<Source>
-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
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");
#endif
return boost::shared_ptr<Source> ();
}
+boost::shared_ptr<Source>
+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<Source> ret (src);
+
+ if (setup_peakfile (ret, false)) {
+ return boost::shared_ptr<Source>();
+ }
+
+ // 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<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)
projects / ardour.git / blobdiff