in compute_gains in case _speakers.n_tuples is 0. Prevent NaN gains if total power...

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

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index 554c36df172552be8470addb4befd06fe9c8a789..f7556cc961fcba63761e48c064e62d540ea4e1ae 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;
 
-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)
@@ -40,10 +40,11 @@ PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unus
 
        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 ();
 
@@ -93,7 +94,7 @@ PlaylistFactory::create (boost::shared_ptr<const Playlist> old, string name, boo
 }
 
 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;