X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioplaylist.h;h=5b1af2dc1ff2e86e08b4e073fea6d74f8e937a08;hb=cd2047cbffc5e0270acab555364bb9d958fe7927;hp=edf5008283a74cde03dea012cc8708f3b9201756;hpb=875f0befd5fb52678d25544fcbcb6e6b55a2c483;p=ardour.git

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index edf5008283..5b1af2dc1f 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -34,13 +34,13 @@ 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;
+	/* fake the type, since crossfades are handled by SequenceProperty which doesn't
+	   care about such things.
+	*/
+	extern PBD::PropertyDescriptor<bool> crossfades;
 }
 
-class AudioPlaylist;	
+class AudioPlaylist;
 
 class CrossfadeListProperty : public PBD::SequenceProperty<std::list<boost::shared_ptr<Crossfade> > >
 {
@@ -57,12 +57,12 @@ private:
 	/* 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;
+	friend class AudioPlaylist;
+	/* we live and die with our playlist, no lifetime management needed */
+	AudioPlaylist& _playlist;
 };
 
-	
+
 class AudioPlaylist : public ARDOUR::Playlist
 {
 public:
@@ -72,28 +72,28 @@ 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 (boost::shared_ptr<const AudioPlaylist>, framepos_t start, framecnt_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);
+	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);
 
 	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&);
+	void crossfades_at (framepos_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:
+
+protected:
 
 	/* playlist "callbacks" */
 	void notify_crossfade_added (boost::shared_ptr<Crossfade>);
@@ -101,23 +101,28 @@ public:
 
 	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);
+	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);
+	void copy_dependents (const std::vector<TwoRegions>&, Playlist*) const;
 
-    private:
-       CrossfadeListProperty _crossfades;
-       Crossfades      _pending_xfade_adds;
+	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>);
+
+private:
+	CrossfadeListProperty _crossfades;
+	Crossfades            _pending_xfade_adds;
 
-       void crossfade_invalidated (boost::shared_ptr<Region>);
-       XMLNode& state (bool full_state);
-       void dump () const;
+	void crossfade_invalidated (boost::shared_ptr<Region>);
+	XMLNode& state (bool full_state);
+	void dump () const;
 
-       bool region_changed (const PBD::PropertyChange&, boost::shared_ptr<Region>);
-       void crossfade_changed (const PBD::PropertyChange&);
-       void add_crossfade (boost::shared_ptr<Crossfade>);
+	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);
+	void source_offset_changed (boost::shared_ptr<AudioRegion> region);
 };
 
 } /* namespace ARDOUR */