Remove all use of nframes_t.

[ardour.git] / libs / ardour / source_factory.cc

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 198a429c5d702f81bd7a45397e14f9f3af3d7acd..f886f952bdb676ca23fe4650d47115291ddfec3f 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -22,6 +22,7 @@
 #include "libardour-config.h"
 #endif
 
+#include "pbd/boost_debug.h"
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "pbd/pthread_utils.h"
@@ -49,7 +50,7 @@ using namespace ARDOUR;
 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;
@@ -57,7 +58,7 @@ std::list<boost::weak_ptr<AudioSource> > SourceFactory::files_with_peaks;
 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) {
 
@@ -120,9 +121,11 @@ SourceFactory::setup_peakfile (boost::shared_ptr<Source> s, bool async)
 }
 
 boost::shared_ptr<Source>
-SourceFactory::createSilent (Session& s, const XMLNode& node, nframes_t nframes, float sr)
+SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_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;
@@ -141,8 +144,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
        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>();
                        }
@@ -157,7 +161,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 
                        /* 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>();
@@ -172,7 +178,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
                }
 
        } 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;
@@ -182,8 +190,8 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 }
 
 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) {
 
@@ -191,8 +199,10 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo
 
                        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>();
                                }
@@ -207,7 +217,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo
                        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>();
                                }
@@ -227,8 +239,10 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo
                }
 
        } 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);
@@ -242,19 +256,21 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path, bo
 }
 
 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, const std::string& origin,
+                              bool destructive, framecnt_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, 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)));
+                                : 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>();
@@ -268,8 +284,10 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
                return ret;
 
        } else if (type == DataType::MIDI) {
-
-               boost::shared_ptr<Source> ret (new SMFSource (s, path, embedded, Source::Flag(0)));
+                // 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);
 
                // no analysis data - this is a new file