$Id$
*/
-#include <pbd/error.h>
-#include <pbd/convert.h>
-#include <pbd/pthread_utils.h>
-
-#include <ardour/source_factory.h>
-#include <ardour/sndfilesource.h>
-#include <ardour/silentfilesource.h>
-#include <ardour/configuration.h>
-#include <ardour/smf_source.h>
-
-#ifdef HAVE_COREAUDIO
-#include <ardour/coreaudiosource.h>
+#include "pbd/error.h"
+#include "pbd/convert.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/stacktrace.h"
+
+#include "ardour/source_factory.h"
+#include "ardour/sndfilesource.h"
+#include "ardour/silentfilesource.h"
+#include "ardour/configuration.h"
+#include "ardour/smf_source.h"
+
+#ifdef HAVE_COREAUDIO
+#define USE_COREAUDIO_FOR_FILES
#endif
+#ifdef USE_COREAUDIO_FOR_FILES
+#include "ardour/coreaudiosource.h"
+#endif
+
+
#include "i18n.h"
using namespace ARDOUR;
sigc::signal<void,boost::shared_ptr<Source> > SourceFactory::SourceCreated;
Glib::Cond* SourceFactory::PeaksToBuild;
-Glib::StaticMutex SourceFactory::peak_building_lock;
+Glib::StaticMutex SourceFactory::peak_building_lock = GLIBMM_STATIC_MUTEX_INIT;
std::list<boost::weak_ptr<AudioSource> > SourceFactory::files_with_peaks;
static void
peak_thread_work ()
{
- PBD::ThreadCreated (pthread_self(), string ("peakbuilder-") + to_string (pthread_self(), std::dec));
+ PBD::notify_gui_about_thread_creation (pthread_self(), string ("peakbuilder-") + to_string (pthread_self(), std::dec));
while (true) {
if (SourceFactory::files_with_peaks.empty()) {
goto wait;
}
-
+
boost::shared_ptr<AudioSource> as (SourceFactory::files_with_peaks.front().lock());
SourceFactory::files_with_peaks.pop_front ();
SourceFactory::peak_building_lock.unlock ();
SourceFactory::createSilent (Session& s, const XMLNode& node, nframes_t nframes, float sr)
{
boost::shared_ptr<Source> ret (new SilentFileSource (s, node, nframes, sr));
+ // no analysis data - the file is non-existent
SourceCreated (ret);
return ret;
}
boost::shared_ptr<Source>
SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
{
- DataType type = DataType::AUDIO;
- const XMLProperty* prop = node.property("type");
-
- if (prop) {
- type = DataType(prop->value());
- }
-
- if (type == DataType::AUDIO) {
-
-#ifdef HAVE_COREAUDIO
-
- try {
- boost::shared_ptr<Source> ret (new CoreAudioSource (s, node));
-
- if (setup_peakfile (ret, defer_peaks)) {
- return boost::shared_ptr<Source>();
- }
-
- SourceCreated (ret);
- return ret;
- }
-
-
- catch (failed_constructor& err) {
-
- /* this is allowed to throw */
-
- boost::shared_ptr<Source> ret (new SndFileSource (s, node));
-
- if (setup_peakfile (ret, defer_peaks)) {
- return boost::shared_ptr<Source>();
- }
-
- SourceCreated (ret);
- return ret;
- }
-#else
- /* this is allowed to throw */
-
- boost::shared_ptr<Source> ret (new SndFileSource (s, node));
-
- if (setup_peakfile (ret, defer_peaks)) {
- return boost::shared_ptr<Source>();
- }
-
- SourceCreated (ret);
- return ret;
-#endif
-
- } else if (type == DataType::MIDI) {
- boost::shared_ptr<Source> ret (new SMFSource (s, node));
-
- SourceCreated (ret);
- return ret;
- }
+ DataType type = DataType::AUDIO;
+ const XMLProperty* prop = node.property("type");
- return boost::shared_ptr<Source>();
-}
+ if (!prop) {
+ return boost::shared_ptr<Source>();
+ }
+
+ type = DataType (prop->value());
-boost::shared_ptr<Source>
-SourceFactory::createReadable (DataType type, Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce, bool defer_peaks)
-{
if (type == DataType::AUDIO) {
-
-#ifdef HAVE_COREAUDIO
- try {
- boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, chn, flags));
+ try {
+
+ boost::shared_ptr<Source> ret (new SndFileSource (s, node));
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
-
- if (announce) {
- SourceCreated (ret);
- }
+ ret->check_for_analysis_data_on_disk ();
+ SourceCreated (ret);
return ret;
- }
+ }
catch (failed_constructor& err) {
- boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
+
+#ifdef USE_COREAUDIO_FOR_FILES
+
+ /* this is allowed to throw */
+
+ boost::shared_ptr<Source> ret (new CoreAudioSource (s, node));
+
if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
- if (announce) {
- SourceCreated (ret);
- }
+
+ ret->check_for_analysis_data_on_disk ();
+ SourceCreated (ret);
return ret;
- }
#else
- boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags));
-
- if (setup_peakfile (ret, defer_peaks)) {
- return boost::shared_ptr<Source>();
- }
-
- if (announce) {
- SourceCreated (ret);
+ throw; // rethrow
+#endif
}
- return ret;
-#endif
-
} else if (type == DataType::MIDI) {
+ boost::shared_ptr<Source> ret (new SMFSource (s, node));
+ ret->check_for_analysis_data_on_disk ();
+ SourceCreated (ret);
+ return ret;
+ }
- // FIXME: flags?
- boost::shared_ptr<Source> ret (new SMFSource (s, path, SMFSource::Flag(0)));
+ return boost::shared_ptr<Source>();
+}
+
+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)
+{
+ if (type == DataType::AUDIO) {
+ if (!(flags & Destructive)) {
+
+ try {
+
+ boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded, chn, flags));
+
+ 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));
+ if (setup_peakfile (ret, defer_peaks)) {
+ return boost::shared_ptr<Source>();
+ }
+ ret->check_for_analysis_data_on_disk ();
+ if (announce) {
+ 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)));
+
if (announce) {
SourceCreated (ret);
}
return ret;
+
}
return boost::shared_ptr<Source>();
}
boost::shared_ptr<Source>
-SourceFactory::createWritable (DataType type, Session& s, std::string path, bool destructive, nframes_t rate, bool announce, bool defer_peaks)
+SourceFactory::createWritable (DataType type, Session& s, const std::string& path, bool embedded,
+ 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,
- Config->get_native_file_data_format(),
- Config->get_native_file_header_format(),
- rate,
- (destructive ? AudioFileSource::Flag (SndFileSource::default_writable_flags | AudioFileSource::Destructive) :
- SndFileSource::default_writable_flags)));
-
- if (setup_peakfile (ret, false)) {
+ boost::shared_ptr<Source> ret (new SndFileSource (s, path, embedded,
+ Config->get_native_file_data_format(),
+ Config->get_native_file_header_format(),
+ rate,
+ (destructive
+ ? Source::Flag (SndFileSource::default_writable_flags | Source::Destructive)
+ : SndFileSource::default_writable_flags)));
+
+ if (setup_peakfile (ret, defer_peaks)) {
return boost::shared_ptr<Source>();
}
+
+ // no analysis data - this is a new file
if (announce) {
SourceCreated (ret);
} else if (type == DataType::MIDI) {
- boost::shared_ptr<Source> ret (new SMFSource (s, path));
+ 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);
return boost::shared_ptr<Source> ();
}
+
projects / ardour.git / blobdiff