/*
- Copyright (C) 2000-2006 Paul Davis
+ Copyright (C) 2000-2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "libardour-config.h"
#endif
+#include "pbd/boost_debug.h"
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/pthread_utils.h"
using namespace std;
using namespace PBD;
-sigc::signal<void,boost::shared_ptr<Source> > SourceFactory::SourceCreated;
+PBD::Signal1<void,boost::shared_ptr<Source> > SourceFactory::SourceCreated;
Glib::Cond* SourceFactory::PeaksToBuild;
Glib::StaticMutex SourceFactory::peak_building_lock = GLIBMM_STATIC_MUTEX_INIT;
std::list<boost::weak_ptr<AudioSource> > SourceFactory::files_with_peaks;
-static void
+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) {
SourceFactory::peak_building_lock.lock ();
-
+
wait:
if (SourceFactory::files_with_peaks.empty()) {
SourceFactory::PeaksToBuild->wait (SourceFactory::peak_building_lock);
boost::shared_ptr<AudioSource> as (SourceFactory::files_with_peaks.front().lock());
SourceFactory::files_with_peaks.pop_front ();
SourceFactory::peak_building_lock.unlock ();
-
+
if (!as) {
continue;
}
boost::shared_ptr<Source>
SourceFactory::createSilent (Session& s, const XMLNode& node, nframes_t nframes, float sr)
{
- boost::shared_ptr<Source> ret (new SilentFileSource (s, node, nframes, sr));
+ Source* src = new SilentFileSource (s, node, nframes, sr);
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
// no analysis data - the file is non-existent
SourceCreated (ret);
return ret;
DataType type = DataType::AUDIO;
const XMLProperty* prop = node.property("type");
- if (!prop) {
- return boost::shared_ptr<Source>();
+ if (prop) {
+ type = DataType (prop->value());
}
- type = DataType (prop->value());
-
if (type == DataType::AUDIO) {
try {
-
- boost::shared_ptr<Source> ret (new SndFileSource (s, node));
+
+ Source* src = new SndFileSource (s, node);
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
ret->check_for_analysis_data_on_disk ();
SourceCreated (ret);
return ret;
- }
-
+ }
+
catch (failed_constructor& err) {
#ifdef USE_COREAUDIO_FOR_FILES
-
+
/* this is allowed to throw */
-
- boost::shared_ptr<Source> ret (new CoreAudioSource (s, node));
-
+
+ Source *src = new CoreAudioSource (s, node);
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
+
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
-
+
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<Source> ret (new SMFSource (s, node));
+ Source* src = new SMFSource (s, node);
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
ret->check_for_analysis_data_on_disk ();
SourceCreated (ret);
return ret;
}
boost::shared_ptr<Source>
-SourceFactory::createReadable (DataType type, Session& s, const string& path, bool embedded,
- int chn, Source::Flag flags, bool announce, bool defer_peaks)
+SourceFactory::createReadable (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<Source> ret (new SndFileSource (s, path, embedded, chn, flags));
+
+ Source* src = new SndFileSource (s, path, chn, flags);
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
-
+
ret->check_for_analysis_data_on_disk ();
if (announce) {
SourceCreated (ret);
}
return ret;
}
-
+
catch (failed_constructor& err) {
#ifdef USE_COREAUDIO_FOR_FILES
-
- boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, embedded, chn, flags));
+
+ Source* src = new CoreAudioSource (s, path, chn, flags);
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
SourceCreated (ret);
}
return ret;
-
+
#else
throw; // rethrow
#endif
} else {
// eh?
}
-
+
} else if (type == DataType::MIDI) {
- boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, SMFSource::Flag(0)));
-
+ Source* src = new SMFSource (s, path, SMFSource::Flag(0));
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
+
if (announce) {
SourceCreated (ret);
}
}
boost::shared_ptr<Source>
-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, nframes_t rate, bool announce, bool defer_peaks)
{
/* this might throw failed_constructor(), which is OK */
-
+
if (type == DataType::AUDIO) {
- boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded,
+ 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)));
+ ? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive)
+ : SndFileSource::default_writable_flags));
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
-
+
// no analysis data - this is a new file
if (announce) {
return ret;
} else if (type == DataType::MIDI) {
+ // XXX writable flags should belong to MidiSource too
+ Source* src = new SMFSource (s, path, SndFileSource::default_writable_flags);
+ // boost_debug_shared_ptr_mark_interesting (src, "Source");
+ boost::shared_ptr<Source> ret (src);
- boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, Source::Flag(0)));
-
// no analysis data - this is a new file
-
+
if (announce) {
SourceCreated (ret);
}
projects / ardour.git / blobdiff