A few type fixes.

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

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index aee5fb3f649f30ed1007a12824b115505e5abdbf..253329b38e7ab79e4a103fb03bc9e07033a0c296 100644 (file)
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -33,12 +33,42 @@ 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;
+       static void make_property_quarks ();
 
-   public:
        AudioPlaylist (Session&, const XMLNode&, bool hidden = false);
        AudioPlaylist (Session&, std::string name, bool hidden = false);
        AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, std::string name, bool hidden = false);
@@ -48,7 +78,7 @@ class AudioPlaylist : public ARDOUR::Playlist
 
        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 version);
 
@@ -59,6 +89,10 @@ class AudioPlaylist : public ARDOUR::Playlist
 
        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" */
@@ -72,7 +106,7 @@ class AudioPlaylist : public ARDOUR::Playlist
         void remove_dependents (boost::shared_ptr<Region> region);
 
     private:
-       Crossfades      _crossfades;
+       CrossfadeListProperty _crossfades;
        Crossfades      _pending_xfade_adds;
 
        void crossfade_invalidated (boost::shared_ptr<Region>);