diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-30 03:31:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-30 03:31:49 +0000 |
| commit | 539aa71d180d6b3d5c887707c356d3d00c0b37e8 (patch) | |
| tree | cb570ae1015351c6c84c462855f137106a6c4645 /libs/ardour/ardour/crossfade.h | |
| parent | 9316ec6d4427fe9f757e79437f374d7aeceb5578 (diff) | |
(MERGED FROM rev 1924 on 2.0-ongoing) fix some (all? not likely) problems with dragging close to 2^32-1 frames
git-svn-id: svn://localhost/ardour2/trunk@1925 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/crossfade.h')
| -rw-r--r-- | libs/ardour/ardour/crossfade.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h index 61a30f1c0f..74fcc6f2fc 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,6 +77,8 @@ 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; } @@ -86,11 +88,11 @@ class Crossfade : public ARDOUR::AudioRegion bool refresh (); - uint32_t upper_layer () const { + layer_t upper_layer () const { return std::max (_in->layer(), _out->layer()); } - uint32_t lower_layer () const { + layer_t lower_layer () const { return std::min (_in->layer(), _out->layer()); } |