fixup botched xfade-as-audioregion; apply work from 2.0-ongoing

git-svn-id: svn://localhost/ardour2/trunk@1933 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 16 insertions, 14 deletions

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index e431759c99..4acbc9ad51 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -72,9 +72,11 @@ class AudioPlaylist : public ARDOUR::Playlist
         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 (Change, boost::shared_ptr<Region>);
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 74fcc6f2fc..61a30f1c0f 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -61,10 +61,10 @@ class Crossfade : public ARDOUR::AudioRegion
 	
 	Crossfade (boost::shared_ptr<ARDOUR::AudioRegion> in, boost::shared_ptr<ARDOUR::AudioRegion> out, CrossfadeModel, bool active);
 
+
 	/* copy constructor to copy a crossfade with new regions. used (for example)
 	   when a playlist copy is made 
 	*/
-
 	Crossfade (boost::shared_ptr<Crossfade>, boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>);
 	
 	/* the usual XML constructor */
@@ -77,8 +77,6 @@ class Crossfade : public ARDOUR::AudioRegion
 	XMLNode& get_state (void);
 	int set_state (const XMLNode&);
 
-	static std::string node_name();
-
 	boost::shared_ptr<ARDOUR::AudioRegion> in() const { return _in; }
 	boost::shared_ptr<ARDOUR::AudioRegion> out() const { return _out; }
 	
@@ -88,11 +86,11 @@ class Crossfade : public ARDOUR::AudioRegion
 	
 	bool refresh ();
 
-	layer_t upper_layer () const {
+	uint32_t upper_layer () const {
 		return std::max (_in->layer(), _out->layer());
 	}
 
-	layer_t lower_layer () const {
+	uint32_t lower_layer () const {
 		return std::min (_in->layer(), _out->layer());
 	}
 
diff --git a/libs/ardour/ardour/curve.h b/libs/ardour/ardour/curve.h
index 5b725f4720..dd63439f08 100644
--- a/libs/ardour/ardour/curve.h
+++ b/libs/ardour/ardour/curve.h
@@ -52,8 +52,8 @@ class Curve : public AutomationList
 	Curve (const Curve& other, double start, double end);
 	Curve (const XMLNode&);
 
-	bool rt_safe_get_vector (double x0, double x1, float *arg, int64_t veclen);
-	void get_vector (double x0, double x1, float *arg, int64_t veclen);
+	bool rt_safe_get_vector (double x0, double x1, float *arg, int32_t veclen);
+	void get_vector (double x0, double x1, float *arg, int32_t veclen);
 
 	AutomationEventList::iterator closest_control_point_before (double xval);
 	AutomationEventList::iterator closest_control_point_after (double xval);
@@ -72,14 +72,14 @@ class Curve : public AutomationList
 	double unlocked_eval (double where);
 	double multipoint_eval (double x);
 
-	void _get_vector (double x0, double x1, float *arg, int64_t veclen);
+	void _get_vector (double x0, double x1, float *arg, int32_t veclen);
 
 };
 
 } // namespace ARDOUR
 
 extern "C" {
-	void curve_get_vector_from_c (void *arg, double, double, float*, int64_t);
+	void curve_get_vector_from_c (void *arg, double, double, float*, int32_t);
 }
 
 #endif /* __ardour_curve_h__ */
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 00d81199a7..9eb66f66b6 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -253,7 +253,7 @@ class Playlist : public PBD::StatefulDestructible, public boost::enable_shared_f
 	
 	int remove_region_internal (boost::shared_ptr<Region>);
 	RegionList *find_regions_at (nframes_t frame);
-	virtual void copy_regions (RegionList&) const;
+	void copy_regions (RegionList&) const;
 	void partition_internal (nframes_t start, nframes_t end, bool cutting, RegionList& thawlist);
 
 	nframes_t _get_maximum_extent() const;
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 006f15e7a4..c3aac3dfa8 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -96,8 +96,6 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
 	nframes_t start ()    const { return _start; }
 	nframes_t length()    const { return _length; }
 	layer_t   layer ()    const { return _layer; }
-	virtual layer_t lower_layer () const { return _layer; }
-	virtual layer_t upper_layer () const { return _layer; }
 	
 	nframes_t sync_offset(int& dir) const;
 	nframes_t sync_position() const;
@@ -190,8 +188,6 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
 	virtual int      set_state (const XMLNode&);
 	virtual int      set_live_state (const XMLNode&, Change&, bool send);
 
-	static std::string node_name();
-
 	virtual boost::shared_ptr<Region> get_parent() const;
 	
 	uint64_t last_layer_op() const { return _last_layer_op; }
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index b155965cab..766c3d4907 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -41,6 +41,12 @@
 typedef int intptr_t;
 #endif
 
+/* eventually, we'd like everything (including JACK) to 
+   move to this. for now, its a dedicated type.
+*/
+
+typedef int64_t                    nframes64_t;
+
 namespace ARDOUR {
 
 	class Source;