resolve gtk + VST threading issues

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

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index da5980599d989f3530224de70d47b10ba4e967ef..0729f21592040c615edc9bf9154247cc59404f6c 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -218,11 +218,11 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 }
 
 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) {
-
+               
                if (!(flags & Destructive)) {
 
                        try {
@@ -272,18 +272,17 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
 
        } else if (type == DataType::MIDI) {
 
-               SMFSource* src = new SMFSource (s, path, SMFSource::Flag(0));
+               boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SMFSource::Flag(0)));
                src->load_model (true, 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;
 
        }
 
@@ -291,19 +290,19 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
 }
 
 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