change Control::{set,get}_float to Control::{set,get}_double and make almost all...

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

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index f5f19d5b5b33f97f39c56d3d7645f2bab759f601..00996a059d1951bfc2f614b49b97ad04941a15f7 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
@@ -15,81 +15,99 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/xml++.h"
 
-#include <ardour/playlist.h>
-#include <ardour/audioplaylist.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> > 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) 
+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;
 
-       pl = boost::shared_ptr<Playlist> (new AudioPlaylist (s, node, hidden));
+       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 (!hidden) {
-               PlaylistCreated (pl);
+       if (pl && !hidden) {
+               PlaylistCreated (pl, unused);
        }
        return pl;
 }
 
-boost::shared_ptr<Playlist> 
-PlaylistFactory::create (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;
 
-       pl = boost::shared_ptr<Playlist> (new AudioPlaylist (s, name, hidden));
+       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 (!hidden) {
-               PlaylistCreated (pl);
+       if (pl && !hidden) {
+               PlaylistCreated (pl, false);
        }
 
        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;
+       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 (!hidden) {
-               PlaylistCreated (pl);
+       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) 
+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;