the Properties & 64bit region commit

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

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 38084a1f7a4577b1d57b7c1462fff37c41fcce77..b5df4cfabb5e1d5feb8df98061bd5c9f554adc4d 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,24 +37,24 @@ 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 (); /* public should use unref() */
+       ~AudioPlaylist ();
 
        void clear (bool with_signals=true);
 
         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&);
-
-       sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade; 
+       int set_state (const XMLNode&, int version);
 
-       template<class T> void foreach_crossfade (T *t, void (T::*func)(boost::shared_ptr<Crossfade>));
+       PBD::Signal1<void,boost::shared_ptr<Crossfade> >  NewCrossfade;
+       
+       void foreach_crossfade (boost::function<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);
@@ -75,12 +75,12 @@ class AudioPlaylist : public ARDOUR::Playlist
        Crossfades      _crossfades;
        Crossfades      _pending_xfade_adds;
 
-       void crossfade_invalidated (boost::shared_ptr<Crossfade>);
+       void crossfade_invalidated (boost::shared_ptr<Region>);
        XMLNode& state (bool full_state);
        void dump () const;
 
-       bool region_changed (Change, boost::shared_ptr<Region>);
-       void crossfade_changed (Change);
+       bool region_changed (PBD::PropertyChange, boost::shared_ptr<Region>);
+       void crossfade_changed (PBD::PropertyChange);
        void add_crossfade (boost::shared_ptr<Crossfade>);
 
        void source_offset_changed (boost::shared_ptr<AudioRegion> region);