/*
- 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
$Id$
*/
-#include <pbd/error.h>
-#include <pbd/convert.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/stacktrace.h>
+#ifdef WAF_BUILD
+#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/source_factory.h>
-#include <ardour/sndfilesource.h>
-#include <ardour/silentfilesource.h>
-#include <ardour/configuration.h>
-#include <ardour/smf_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>
+#include "ardour/coreaudiosource.h"
#endif
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::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) {
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, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
// no analysis data - the file is non-existent
SourceCreated (ret);
return ret;
const XMLProperty* prop = node.property("type");
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, typeid(src).name());
+ 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 *s = new CoreAudioSource (s, node);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ 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, typeid(src).name());
+ 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, string path, int chn, AudioFileSource::Flag flags, bool announce, bool defer_peaks)
+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, chn, flags));
+
+ Source* src = new SndFileSource (s, path, embedded, chn, flags);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ 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, chn, flags));
+
+ Source* src = new CoreAudioSource (s, path, embedded, chn, flags);
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ 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) {
- // FIXME: flags?
- boost::shared_ptr<Source> ret (new SMFSource (s, path, SMFSource::Flag(0)));
-
+ Source* src = new SMFSource (s, path, embedded, SMFSource::Flag(0));
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
+
if (announce) {
SourceCreated (ret);
}
}
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)));
+ Source* src = 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));
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ 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) {
} else if (type == DataType::MIDI) {
- boost::shared_ptr<Source> ret (new SMFSource (s, path));
-
+ Source* src = new SMFSource (s, path, embedded, Source::Flag(0));
+ // boost_debug_shared_ptr_mark_interesting (src, typeid(src).name());
+ boost::shared_ptr<Source> ret (src);
+
// no analysis data - this is a new file
-
+
if (announce) {
SourceCreated (ret);
}
return boost::shared_ptr<Source> ();
}
+
projects / ardour.git / blobdiff