rework Stateful::set_state() patch to avoid default version argument

[ardour.git] / libs / ardour / ardour / audioplaylist.h

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 4acbc9ad510328d52fac709004fcbb1a299e777e..277fe5a8e194b33d0b943f61f2e1873e7a2f3a62 100644 (file)
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 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
@@ -23,8 +23,8 @@
 #include <vector>
 #include <list>
 
-#include <ardour/ardour.h>
-#include <ardour/playlist.h>
+#include "ardour/ardour.h"
+#include "ardour/playlist.h"
 
 namespace ARDOUR  {
 
@@ -37,12 +37,12 @@ class AudioPlaylist : public ARDOUR::Playlist
 {
   public:
        typedef std::list<boost::shared_ptr<Crossfade> > Crossfades;
-       
+
    public:
        AudioPlaylist (Session&, const XMLNode&, bool hidden = false);
-       AudioPlaylist (Session&, string name, bool hidden = false);
-       AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, string name, bool hidden = false);
-       AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, nframes_t start, nframes_t cnt, string name, bool hidden = false);
+       AudioPlaylist (Session&, std::string name, bool hidden = false);
+       AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, std::string name, bool hidden = false);
+       AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, nframes_t start, nframes_t cnt, std::string name, bool hidden = false);
 
        ~AudioPlaylist ();
 
@@ -50,11 +50,11 @@ class AudioPlaylist : public ARDOUR::Playlist
 
         nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
 
-       sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade; 
+       sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade;
 
-       template<class T> void foreach_crossfade (T *t, void (T::*func)(boost::shared_ptr<Crossfade>));
+       void foreach_crossfade (sigc::slot<void, boost::shared_ptr<Crossfade> >);
        void crossfades_at (nframes_t frame, Crossfades&);
 
        bool destroy_region (boost::shared_ptr<Region>);
@@ -66,7 +66,7 @@ class AudioPlaylist : public ARDOUR::Playlist
        void flush_notifications ();
 
        void finalize_split_region (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right);
-       
+
         void refresh_dependents (boost::shared_ptr<Region> region);
         void check_dependents (boost::shared_ptr<Region> region, bool norefresh);
         void remove_dependents (boost::shared_ptr<Region> region);