X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioplaylist.h;h=253329b38e7ab79e4a103fb03bc9e07033a0c296;hb=cdfbec0eb1289c17159f3263c1e6256afdee67dc;hp=586bf6ccc670494418ae641bbbd3ec62222c5270;hpb=1c167454eb2d498ed0ed453136ad3042aee0b556;p=ardour.git

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 586bf6ccc6..253329b38e 100644
--- 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
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_audio_playlist_h__
@@ -24,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  {
 
@@ -34,54 +33,88 @@ class Region;
 class AudioRegion;
 class Source;
 
+namespace Properties {
+        /* fake the type, since crossfades are handled by SequenceProperty which doesn't
+           care about such things.
+        */
+        extern PBD::PropertyDescriptor<bool> crossfades;
+}
+
+class AudioPlaylist;	
+
+class CrossfadeListProperty : public PBD::SequenceProperty<std::list<boost::shared_ptr<Crossfade> > >
+{
+public:
+	CrossfadeListProperty (AudioPlaylist &);
+
+	void get_content_as_xml (boost::shared_ptr<Crossfade>, XMLNode &) const;
+	boost::shared_ptr<Crossfade> get_content_from_xml (XMLNode const &) const;
+
+private:
+	CrossfadeListProperty* clone () const;
+	CrossfadeListProperty* create () const;
+
+	/* copy construction only by ourselves */
+	CrossfadeListProperty (CrossfadeListProperty const & p);
+
+        friend class AudioPlaylist;
+        /* we live and die with our playlist, no lifetime management needed */
+        AudioPlaylist& _playlist;
+};
+
+	
 class AudioPlaylist : public ARDOUR::Playlist
 {
-  public:
+public:
 	typedef std::list<boost::shared_ptr<Crossfade> > Crossfades;
-	
-   public:
+	static void make_property_quarks ();
+
 	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);
+        framecnt_t read (Sample *dst, Sample *mixdown, float *gain_buffer, framepos_t start, framecnt_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; 
-
-	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>);
 
+	void update (const CrossfadeListProperty::ChangeRecord &);
+
+	boost::shared_ptr<Crossfade> find_crossfade (const PBD::ID &) const;
+	
     protected:
 
 	/* playlist "callbacks" */
 	void notify_crossfade_added (boost::shared_ptr<Crossfade>);
-	void flush_notifications ();
+	void flush_notifications (bool);
 
 	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);
 
     private:
-       Crossfades      _crossfades;
+       CrossfadeListProperty _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 (const PBD::PropertyChange&, boost::shared_ptr<Region>);
+       void crossfade_changed (const PBD::PropertyChange&);
        void add_crossfade (boost::shared_ptr<Crossfade>);
 
        void source_offset_changed (boost::shared_ptr<AudioRegion> region);