X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplaylist_factory.cc;h=46f9910738d1c4562d52b7617cfb156804d0b731;hb=b52bf1a42c71ae943eaff2bca4c309618c173ab3;hp=554c36df172552be8470addb4befd06fe9c8a789;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index 554c36df17..46f9910738 100644
--- a/libs/ardour/playlist_factory.cc
+++ b/libs/ardour/playlist_factory.cc
@@ -25,32 +25,38 @@
 #include "ardour/midi_playlist.h"
 #include "ardour/playlist_factory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-sigc::signal<void,boost::shared_ptr<Playlist>, bool> PlaylistFactory::PlaylistCreated;
+PBD::Signal2<void,boost::shared_ptr<Playlist>, bool> PlaylistFactory::PlaylistCreated;
 
 boost::shared_ptr<Playlist>
 PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unused)
 {
-	const XMLProperty* type = node.property("type");
+	XMLProperty const * 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));
+	try {
+		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 ();
+		pl->set_region_ownership ();
+
+		if (pl && !hidden) {
+			PlaylistCreated (pl, unused);
+		}
+		return pl;
 
-	if (pl && !hidden) {
-		PlaylistCreated (pl, unused);
+	} catch (...) {
+		return boost::shared_ptr<Playlist> ();
 	}
-	return pl;
 }
 
 boost::shared_ptr<Playlist>
@@ -58,16 +64,20 @@ 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));
+	try {
+		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, false);
-	}
+		if (pl && !hidden) {
+			PlaylistCreated (pl, false);
+		}
 
-	return pl;
+		return pl;
+	} catch (...) {
+		return boost::shared_ptr<Playlist> ();
+	}
 }
 
 boost::shared_ptr<Playlist>
@@ -77,37 +87,47 @@ PlaylistFactory::create (boost::shared_ptr<const Playlist> old, string name, boo
 	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 ();
-	}
+	try {
 
-	if (pl && !hidden) {
-		PlaylistCreated (pl, false);
+		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, false);
+		}
+
+		return pl;
+	} catch (...) {
+		return boost::shared_ptr<Playlist> ();
 	}
 
-	return pl;
 }
 
 boost::shared_ptr<Playlist>
-PlaylistFactory::create (boost::shared_ptr<const Playlist> old, nframes_t start, nframes_t cnt, string name, bool hidden)
+PlaylistFactory::create (boost::shared_ptr<const Playlist> old, framepos_t start, framecnt_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 ();
-	}
+	try {
+		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 */
+		/* this factory method does NOT notify others */
 
-	return pl;
+		return pl;
+	} catch (...) {
+		return boost::shared_ptr<Playlist> ();
+	}
 }