diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-10 19:20:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-10 19:20:15 +0000 |
| commit | d23a6de077181caa24af52229bb040c87ed34ebd (patch) | |
| tree | 664ec7adbdf87826aced9b8d02d6b2603bf5d61d /libs/ardour/ardour/playlist.h | |
| parent | 6e211e27e2027da328b6fe117f10e1962c007afb (diff) | |
fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id()
git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/playlist.h')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 9e15b9cf5d..529ec25d14 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -201,9 +201,8 @@ public: void raise_region_to_top (boost::shared_ptr<Region>); void lower_region_to_bottom (boost::shared_ptr<Region>); - /* XXX: use of diskstream here is a little unfortunate */ - const PBD::ID& get_orig_diskstream_id () const { return _orig_diskstream_id; } - void set_orig_diskstream_id (const PBD::ID& did) { _orig_diskstream_id = did; } + const PBD::ID& get_orig_track_id () const { return _orig_track_id; } + void set_orig_track_id (const PBD::ID& did) { _orig_track_id = did; } /* destructive editing */ @@ -290,7 +289,7 @@ public: bool in_partition; bool _frozen; uint32_t subcnt; - PBD::ID _orig_diskstream_id; + PBD::ID _orig_track_id; uint64_t layer_op_counter; framecnt_t freeze_length; bool auto_partition; |