try not thinning when loading old-school automation lists

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

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 1bf3956694269e8e5adb98d6fa1b2fddaba399ad..b0803a9d34cbf9d55f2f9cedc8fd0f5ddfb90f99 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -30,18 +30,15 @@
 
 #include "ardour/audioplaylist.h"
 #include "ardour/audio_playlist_source.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_playlist_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"
 #endif
 
@@ -147,44 +144,67 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
 
        if (type == DataType::AUDIO) {
 
-               try {
-                       Source* src = new SndFileSource (s, node);
+               /* it could be nested */
+
+               if (node.property ("playlist") != 0) {
+
+                       try {
+                               boost::shared_ptr<AudioPlaylistSource> ap (new AudioPlaylistSource (s, node));
+                               
+                               if (setup_peakfile (ap, true)) {
+                                       return boost::shared_ptr<Source>();
+                               }
+
+                               ap->check_for_analysis_data_on_disk ();
+
+                               SourceCreated (ap);
+                               return ap;
+
+                       } catch (failed_constructor&) {
+                               /* oh well, so much for that then ... */
+                       }
+
+               } else {
+
+
+                       try {
+                               Source* src = new SndFileSource (s, node);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-                       // boost_debug_shared_ptr_mark_interesting (src, "Source");
+                               // 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>();
+                               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;
                        }
-                       ret->check_for_analysis_data_on_disk ();
-                       SourceCreated (ret);
-                       return ret;
-               }
 
-               catch (failed_constructor& err) {
+                       catch (failed_constructor& err) {
 
-#ifdef USE_COREAUDIO_FOR_FILES
+#ifdef HAVE_COREAUDIO
 
-                       /* this is allowed to throw */
+                               /* this is allowed to throw */
 
-                       Source *src = new CoreAudioSource (s, node);
+                               Source *src = new CoreAudioSource (s, node);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-                       // boost_debug_shared_ptr_mark_interesting (src, "Source");
+                               // boost_debug_shared_ptr_mark_interesting (src, "Source");
 #endif
-                       boost::shared_ptr<Source> ret (src);
+                               boost::shared_ptr<Source> ret (src);
 
-                       if (setup_peakfile (ret, defer_peaks)) {
-                               return boost::shared_ptr<Source>();
-                       }
+                               if (setup_peakfile (ret, defer_peaks)) {
+                                       return boost::shared_ptr<Source>();
+                               }
 
-                       ret->check_for_analysis_data_on_disk ();
-                       SourceCreated (ret);
-                       return ret;
+                               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<SMFSource> src (new SMFSource (s, node));
                src->load_model (true, true);
@@ -214,7 +234,7 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
                                // 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>();
                                }
@@ -227,7 +247,7 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
                        }
 
                        catch (failed_constructor& err) {
-#ifdef USE_COREAUDIO_FOR_FILES
+#ifdef HAVE_COREAUDIO
 
                                Source* src = new CoreAudioSource (s, path, chn, flags);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
@@ -253,7 +273,7 @@ SourceFactory::createReadable (DataType type, Session& s, const string& path,
                }
 
        } else if (type == DataType::MIDI) {
-               
+
                SMFSource* src = new SMFSource (s, path, SMFSource::Flag(0));
                src->load_model (true, true);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
@@ -306,7 +326,7 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
                 // XXX writable flags should belong to MidiSource too
                boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags));
                assert (src->writable ());
-               
+
                src->load_model (true, true);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
                // boost_debug_shared_ptr_mark_interesting (src, "Source");
@@ -325,7 +345,7 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat
 }
 
 boost::shared_ptr<Source>
-SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr<Playlist> p, const std::string& name,
+SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr<Playlist> p, const PBD::ID& orig, const std::string& name,
                                   uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks)
 {
        if (type == DataType::AUDIO) {
@@ -334,17 +354,21 @@ SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr<
                        boost::shared_ptr<AudioPlaylist> ap = boost::dynamic_pointer_cast<AudioPlaylist>(p);
 
                        if (ap) {
-                               Source* src = new AudioPlaylistSource (s, name, ap, chn, start, len, copy, Source::Flag (0));
+
+                               if (copy) {
+                                       ap.reset (new AudioPlaylist (ap, start, len, name, true));
+                                       start = 0;
+                               }
+
+                               Source* src = new AudioPlaylistSource (s, orig, name, ap, chn, start, len, Source::Flag (0));
                                boost::shared_ptr<Source> ret (src);
-                               
+
                                if (setup_peakfile (ret, defer_peaks)) {
                                        return boost::shared_ptr<Source>();
                                }
-                               
+
                                ret->check_for_analysis_data_on_disk ();
-                               
-                               /* we never announce these sources */
-                               
+                               SourceCreated (ret);
                                return ret;
                        }
                }
@@ -355,6 +379,29 @@ SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr<
 
        } else if (type == DataType::MIDI) {
 
+               try {
+
+                       boost::shared_ptr<MidiPlaylist> ap = boost::dynamic_pointer_cast<MidiPlaylist>(p);
+
+                       if (ap) {
+
+                               if (copy) {
+                                       ap.reset (new MidiPlaylist (ap, start, len, name, true));
+                                       start = 0;
+                               }
+
+                               Source* src = new MidiPlaylistSource (s, orig, name, ap, chn, start, len, Source::Flag (0));
+                               boost::shared_ptr<Source> ret (src);
+
+                               SourceCreated (ret);
+                               return ret;
+                       }
+               }
+
+               catch (failed_constructor& err) {
+                       /* relax - return at function scope */
+               }
+
        }
 
        return boost::shared_ptr<Source>();