refactor MIDISceneChange color property addition by moving it into SceneChange to...

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

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index cfcec40d1b6bece3cad0c1ca64385e640ec9c15f..5c3d93a0a0f762ed9fc2bf97cecdc1a5f7653576 100644 (file)
--- a/libs/ardour/playlist_factory.cc
+++ b/libs/ardour/playlist_factory.cc
@@ -31,7 +31,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-boost::signals2::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)
@@ -40,17 +40,23 @@ PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unus
 
        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, unused);
+       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 ();
+               
+               if (pl && !hidden) {
+                       PlaylistCreated (pl, unused);
+               }
+               return pl;
+
+       } 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));
-
-       if (pl && !hidden) {
-               PlaylistCreated (pl, false);
+       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);
+               }
+               
+               return pl;
+       } catch (...) {
+               return boost::shared_ptr<Playlist> ();
        }
-
-       return pl;
 }
 
 boost::shared_ptr<Playlist>
@@ -76,38 +86,48 @@ PlaylistFactory::create (boost::shared_ptr<const Playlist> old, string name, boo
        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 ();
+       
+       try {
+
+               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> ();
        }
-
-       if (pl && !hidden) {
-               PlaylistCreated (pl, false);
-       }
-
-       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 */
+               
+               return pl;
+       } catch (...) {
+               return boost::shared_ptr<Playlist> ();
        }
-
-       /* this factory method does NOT notify others */
-
-       return pl;
 }