diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 7 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 3 |
3 files changed, 5 insertions, 6 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; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 3c1c9b564b..19935c5440 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -243,6 +243,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi boost::shared_ptr<Route> route_by_name (std::string); boost::shared_ptr<Route> route_by_id (PBD::ID); boost::shared_ptr<Route> route_by_remote_id (uint32_t id); + boost::shared_ptr<Track> track_by_diskstream_id (PBD::ID); void routes_using_input_from (const std::string& str, RouteList& rl); bool route_name_unique (std::string) const; diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 79e968c8ed..496b1e195b 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -98,8 +98,7 @@ class Track : public Route, public PublicDiskstream bool record_enabled() const; void set_record_enabled (bool yn, void *src); - /* XXX: unfortunate that this is exposed */ - PBD::ID const & diskstream_id () const; + bool using_diskstream_id (PBD::ID) const; void set_block_size (pframes_t); |