X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioplaylist.h;h=478d4872cdfe02afdd56503e3babc7a83b6a1871;hb=7bc3e0dab4dfac04d6c2957a2278345605c09769;hp=ce7c8aa33557defe0bfd48a374d86224f452da5f;hpb=3c00a7ca2ae34cb65c8d3394d9a012f20c69ee77;p=ardour.git

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index ce7c8aa335..478d4872cd 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -33,57 +33,32 @@ class Region;
 class AudioRegion;
 class Source;
 
+class AudioPlaylist;
+
 class AudioPlaylist : public ARDOUR::Playlist
 {
-  public:
-	typedef std::list<boost::shared_ptr<Crossfade> > Crossfades;
-
-   public:
+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);
-	AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, nframes_t start, nframes_t cnt, std::string name, bool hidden = false);
-
-	~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&, int version);
+	AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, framepos_t start, framecnt_t cnt, std::string name, bool hidden = false);
 
-	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&);
+	framecnt_t read (Sample *dst, Sample *mixdown, float *gain_buffer, framepos_t start, framecnt_t cnt, uint32_t chan_n=0);
 
 	bool destroy_region (boost::shared_ptr<Region>);
 
-    protected:
+protected:
 
-	/* playlist "callbacks" */
-	void notify_crossfade_added (boost::shared_ptr<Crossfade>);
-	void flush_notifications ();
+	void pre_combine (std::vector<boost::shared_ptr<Region> >&);
+	void post_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>);
+	void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>);
 
-	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;
-       Crossfades      _pending_xfade_adds;
-
-       void crossfade_invalidated (boost::shared_ptr<Region>);
-       XMLNode& state (bool full_state);
-       void dump () const;
-
-       bool region_changed (PBD::Change, boost::shared_ptr<Region>);
-       void crossfade_changed (PBD::Change);
-       void add_crossfade (boost::shared_ptr<Crossfade>);
-
-       void source_offset_changed (boost::shared_ptr<AudioRegion> region);
+private:
+	int set_state (const XMLNode&, int version);
+	void dump () const;
+	bool region_changed (const PBD::PropertyChange&, boost::shared_ptr<Region>);
+	void source_offset_changed (boost::shared_ptr<AudioRegion>);
+        void load_legacy_crossfades (const XMLNode&, int version);
 };
 
 } /* namespace ARDOUR */