X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fsource_factory.cc;h=f8b721b99a15fac60fdb2920ff32cb014ffb2d7a;hb=1b8e8303b25b6b013367741f2b47be3585b22cb3;hp=c9f7386c008e073b66565a7d743bb3c93fd5dac6;hpb=66a9112d48b5726f61eec7ce4cfc4bd15b9420d0;p=ardour.git

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index c9f7386c00..f8b721b99a 100644
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -124,7 +124,9 @@ boost::shared_ptr<Source>
 SourceFactory::createSilent (Session& s, const XMLNode& node, framecnt_t nframes, float sr)
 {
 	Source* src = new SilentFileSource (s, node, nframes, sr);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 	// boost_debug_shared_ptr_mark_interesting (src, "Source");
+#endif
 	boost::shared_ptr<Source> ret (src);
 	// no analysis data - the file is non-existent
 	SourceCreated (ret);
@@ -145,7 +147,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 
 		try {
 			Source* src = new SndFileSource (s, node);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 			// boost_debug_shared_ptr_mark_interesting (src, "Source");
+#endif
 			boost::shared_ptr<Source> ret (src);
 			if (setup_peakfile (ret, defer_peaks)) {
 				return boost::shared_ptr<Source>();
@@ -162,7 +166,9 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 			/* this is allowed to throw */
 
 			Source *src = new CoreAudioSource (s, node);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 			// boost_debug_shared_ptr_mark_interesting (src, "Source");
+#endif
 			boost::shared_ptr<Source> ret (src);
 
 			if (setup_peakfile (ret, defer_peaks)) {
@@ -178,12 +184,14 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 		}
 
 	} else if (type == DataType::MIDI) {
-		Source* src = new SMFSource (s, node);
+		boost::shared_ptr<SMFSource> src (new SMFSource (s, node));
+		src->load_model (true, true);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 		// 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;
+#endif
+		src->check_for_analysis_data_on_disk ();
+		SourceCreated (src);
+		return src;
 	}
 
 	return boost::shared_ptr<Source>();
@@ -200,7 +208,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
 			try {
 
 				Source* src = new SndFileSource (s, path, chn, flags);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 				// boost_debug_shared_ptr_mark_interesting (src, "Source");
+#endif
 				boost::shared_ptr<Source> ret (src);
 				
 				if (setup_peakfile (ret, defer_peaks)) {
@@ -218,7 +228,9 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
 #ifdef USE_COREAUDIO_FOR_FILES
 
 				Source* src = new CoreAudioSource (s, path, chn, flags);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 				// boost_debug_shared_ptr_mark_interesting (src, "Source");
+#endif
 				boost::shared_ptr<Source> ret (src);
 				if (setup_peakfile (ret, defer_peaks)) {
 					return boost::shared_ptr<Source>();
@@ -240,8 +252,11 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
 
 	} else if (type == DataType::MIDI) {
 		
-		Source* src = new SMFSource (s, path, SMFSource::Flag(0));
+		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) {
@@ -257,7 +272,7 @@ 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,
-			       bool destructive, nframes_t rate, bool announce, bool defer_peaks)
+			       bool destructive, framecnt_t rate, bool announce, bool defer_peaks)
 {
 	/* this might throw failed_constructor(), which is OK */
 
@@ -269,7 +284,9 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
 				(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
 		boost::shared_ptr<Source> ret (src);
 
 		if (setup_peakfile (ret, defer_peaks)) {
@@ -285,16 +302,18 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
 
 	} else if (type == DataType::MIDI) {
                 // XXX writable flags should belong to MidiSource too
-		Source* src = new SMFSource (s, path, SndFileSource::default_writable_flags); 
+		boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags));
+		src->load_model (true, true);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 		// boost_debug_shared_ptr_mark_interesting (src, "Source");
-		boost::shared_ptr<Source> ret (src);
+#endif
 
 		// no analysis data - this is a new file
 
 		if (announce) {
-			SourceCreated (ret);
+			SourceCreated (src);
 		}
-		return ret;
+		return src;
 
 	}