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

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 586bf6ccc6..478d4872cd 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,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&, 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 (); /* public should use unref() */
-
-	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&);
+	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>, framepos_t start, framecnt_t cnt, std::string name, bool hidden = false);
 
-	sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade; 
-
-	template<class T> void foreach_crossfade (T *t, void (T::*func)(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:
-
-	/* playlist "callbacks" */
-	void notify_crossfade_added (boost::shared_ptr<Crossfade>);
-	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);
-
-    private:
-       Crossfades      _crossfades;
-       Crossfades      _pending_xfade_adds;
-
-       void crossfade_invalidated (boost::shared_ptr<Crossfade>);
-       XMLNode& state (bool full_state);
-       void dump () const;
+protected:
 
-       bool region_changed (Change, boost::shared_ptr<Region>);
-       void crossfade_changed (Change);
-       void add_crossfade (boost::shared_ptr<Crossfade>);
+	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 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 */