Add a null check to ports when loading an export channel from xml + fix indentation...

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

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index 129ff514afb0a3013b8c5a31e1afcb33fef6d8ea..f7556cc961fcba63761e48c064e62d540ea4e1ae 100644 (file)
--- a/libs/ardour/playlist_factory.cc
+++ b/libs/ardour/playlist_factory.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,31 +17,34 @@
 
 */
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/xml++.h"
 
-#include <ardour/playlist.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/midi_playlist.h>
-#include <ardour/playlist_factory.h>
+#include "ardour/playlist.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/playlist_factory.h"
 
 #include "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> 
+boost::shared_ptr<Playlist>
 PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unused)
 {
        const XMLProperty* type = node.property("type");
 
        boost::shared_ptr<Playlist> pl;
 
-       if ( !type || type->value() == "audio" )
+       if (!type || type->value() == "audio") {
                pl = boost::shared_ptr<Playlist> (new AudioPlaylist (s, node, hidden));
-       else if ( type->value() == "midi" )
+        } else if (type->value() == "midi") {
                pl = boost::shared_ptr<Playlist> (new MidiPlaylist (s, node, hidden));
+        }
 
        pl->set_region_ownership ();
 
@@ -51,8 +54,8 @@ PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unus
        return pl;
 }
 
-boost::shared_ptr<Playlist> 
-PlaylistFactory::create (DataType type, Session& s, string name, bool hidden) 
+boost::shared_ptr<Playlist>
+PlaylistFactory::create (DataType type, Session& s, string name, bool hidden)
 {
        boost::shared_ptr<Playlist> pl;
 
@@ -68,8 +71,8 @@ PlaylistFactory::create (DataType type, Session& s, string name, bool hidden)
        return pl;
 }
 
-boost::shared_ptr<Playlist> 
-PlaylistFactory::create (boost::shared_ptr<const Playlist> old, string name, bool hidden) 
+boost::shared_ptr<Playlist>
+PlaylistFactory::create (boost::shared_ptr<const Playlist> old, string name, bool hidden)
 {
        boost::shared_ptr<Playlist> pl;
        boost::shared_ptr<const AudioPlaylist> apl;
@@ -90,13 +93,13 @@ PlaylistFactory::create (boost::shared_ptr<const Playlist> old, string name, boo
        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>
+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 ();