diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-12-30 20:05:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-12-30 20:05:48 +0000 |
| commit | dd53e7284ae1ef8ae594cb1a34db6500f944eab3 (patch) | |
| tree | 88efed9f99a937cb065f8cbff81c441d8d3abcfb /libs/ardour/ardour/region.h | |
| parent | 2c23ff8ceb51297aee7ae71d96e9b61dc9089343 (diff) | |
Set up layering_index immediately on an explicit layer, so that undo
works properly. Stop the layer being a stateful property, as it is
always derived from layering_index, unambigiously, by relayer().
git-svn-id: svn://localhost/ardour2/branches/3.0@11120 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/region.h')
| -rw-r--r-- | libs/ardour/ardour/region.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index ab1559fc4a..cf180556b4 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -294,10 +294,6 @@ class Region void invalidate_transients (); - void set_pending_layer (double); - bool reset_pending_layer (); - boost::optional<double> pending_layer () const; - void drop_sources (); protected: @@ -341,7 +337,6 @@ class Region PBD::Property<framepos_t> _position; /** Sync position relative to the start of our file */ PBD::Property<framepos_t> _sync_position; - PBD::Property<layer_t> _layer; SourceList _sources; /** Used when timefx are applied, so we can always use the original source */ @@ -389,8 +384,7 @@ class Region framepos_t _last_position; mutable RegionEditState _first_edit; Timecode::BBT_Time _bbt_time; - - boost::optional<double> _pending_layer; + layer_t _layer; void register_properties (); |