Fix include statements so they match all other files in gtk2_ardour

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

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index f5f19d5b5b33f97f39c56d3d7645f2bab759f601..a801bae76c76d58a1e5e31961b7a8990c66d4579 100644 (file)
--- a/libs/ardour/playlist_factory.cc
+++ b/libs/ardour/playlist_factory.cc
@@ -15,13 +15,13 @@
     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 <ardour/playlist.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/midi_playlist.h>
 #include <ardour/playlist_factory.h>
 
 #include "i18n.h"
@@ -34,26 +34,34 @@ sigc::signal<void,boost::shared_ptr<Playlist> > PlaylistFactory::PlaylistCreated
 boost::shared_ptr<Playlist> 
 PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden) 
 {
+       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) {
+       if (pl && !hidden) {
                PlaylistCreated (pl);
        }
        return pl;
 }
 
 boost::shared_ptr<Playlist> 
-PlaylistFactory::create (Session& s, string name, bool hidden) 
+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) {
+       if (pl && !hidden) {
                PlaylistCreated (pl);
        }
 
@@ -65,13 +73,17 @@ 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 ();
        }
 
-       if (!hidden) {
+       if (pl && !hidden) {
                PlaylistCreated (pl);
        }
 
@@ -83,13 +95,16 @@ PlaylistFactory::create (boost::shared_ptr<const Playlist> old, nframes_t start,
 {
        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;