Merged with trunk R1283.

NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 79 insertions, 12 deletions

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index 4461783874..862f85a402 100644
--- a/libs/ardour/playlist_factory.cc
+++ b/libs/ardour/playlist_factory.cc
@@ -22,24 +22,91 @@
 
 #include <ardour/playlist.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/midi_playlist.h>
+#include <ardour/playlist_factory.h>
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 
-Playlist*
-Playlist::copyPlaylist (const Playlist& playlist, nframes_t start, nframes_t length,
-			string name, bool result_is_hidden)
+sigc::signal<void,boost::shared_ptr<Playlist> > PlaylistFactory::PlaylistCreated;
+
+boost::shared_ptr<Playlist> 
+PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden) 
+{
+	const XMLProperty* type = node.property("type");
+
+	boost::shared_ptr<Playlist> pl;
+
+	if ( !type || type->value() == "audio" )
+		pl = boost::shared_ptr<Playlist> (new AudioPlaylist (s, node, hidden));
+	else if ( type->value() == "midi" )
+		pl = boost::shared_ptr<Playlist> (new MidiPlaylist (s, node, hidden));
+
+	pl->set_region_ownership ();
+
+	if (pl && !hidden) {
+		PlaylistCreated (pl);
+	}
+	return pl;
+}
+
+boost::shared_ptr<Playlist> 
+PlaylistFactory::create (DataType type, Session& s, string name, bool hidden) 
+{
+	boost::shared_ptr<Playlist> pl;
+
+	if (type == DataType::AUDIO)
+		pl = boost::shared_ptr<Playlist> (new AudioPlaylist (s, name, hidden));
+	else if (type == DataType::MIDI)
+		pl = boost::shared_ptr<Playlist> (new MidiPlaylist (s, name, hidden));
+
+	if (pl && !hidden) {
+		PlaylistCreated (pl);
+	}
+
+	return pl;
+}
+
+boost::shared_ptr<Playlist> 
+PlaylistFactory::create (boost::shared_ptr<const Playlist> old, string name, bool hidden) 
 {
-	const AudioPlaylist* apl;
-
-	if ((apl = dynamic_cast<const AudioPlaylist*> (&playlist)) != 0) {
-		return new AudioPlaylist (*apl, start, length, name, result_is_hidden);
-	} else {
-		fatal << _("programming error: Playlist::copyPlaylist called with unknown Playlist type")
-		      << endmsg;
-		/*NOTREACHED*/
-		return 0;
+	boost::shared_ptr<Playlist> pl;
+	boost::shared_ptr<const AudioPlaylist> apl;
+	boost::shared_ptr<const MidiPlaylist> mpl;
+
+	if ((apl = boost::dynamic_pointer_cast<const AudioPlaylist> (old)) != 0) {
+		pl = boost::shared_ptr<Playlist> (new AudioPlaylist (apl, name, hidden));
+		pl->set_region_ownership ();
+	} else if ((mpl = boost::dynamic_pointer_cast<const MidiPlaylist> (old)) != 0) {
+		pl = boost::shared_ptr<Playlist> (new MidiPlaylist (mpl, name, hidden));
+		pl->set_region_ownership ();
 	}
+
+	if (pl && !hidden) {
+		PlaylistCreated (pl);
+	}
+
+	return pl;
+}
+
+boost::shared_ptr<Playlist> 
+PlaylistFactory::create (boost::shared_ptr<const Playlist> old, nframes_t start, nframes_t cnt, string name, bool hidden) 
+{
+	boost::shared_ptr<Playlist> pl;
+	boost::shared_ptr<const AudioPlaylist> apl;
+	boost::shared_ptr<const MidiPlaylist> mpl;
+	
+	if ((apl = boost::dynamic_pointer_cast<const AudioPlaylist> (old)) != 0) {
+		pl = boost::shared_ptr<Playlist> (new AudioPlaylist (apl, start, cnt, name, hidden));
+		pl->set_region_ownership ();
+	} else if ((mpl = boost::dynamic_pointer_cast<const MidiPlaylist> (old)) != 0) {
+		pl = boost::shared_ptr<Playlist> (new MidiPlaylist (mpl, start, cnt, name, hidden));
+		pl->set_region_ownership ();
+	}
+
+	/* this factory method does NOT notify others */
+
+	return pl;
 }