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/playlist.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/playlist.h')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index a7ead83eef..67cc1ccf54 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -223,6 +223,8 @@ public: uint32_t combine_ops() const { return _combine_ops; } uint64_t highest_layering_index () const; + + void set_layer (boost::shared_ptr<Region>, double); protected: friend class Session; @@ -271,7 +273,7 @@ public: bool save_on_thaw; std::string last_save_reason; uint32_t in_set_state; - bool in_update; + bool in_undo; bool first_set_state; bool _hidden; bool _splicing; |