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

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index a0da358777..478d4872cd 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -33,96 +33,32 @@ 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 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:
-	typedef std::list<boost::shared_ptr<Crossfade> > Crossfades;
-	static void make_property_quarks ();
-
 	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>, framepos_t start, framecnt_t cnt, std::string name, bool hidden = false);
 
-	~AudioPlaylist ();
-
-	void clear (bool with_signals=true);
-
-        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 (framepos_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>);
 
-	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 (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);
-	void copy_dependents (const std::vector<TwoRegions>&, boost::shared_ptr<Playlist>);
+protected:
 
 	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;
-
-       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);
+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 */