diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-26 17:56:35 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-26 17:56:35 +0000 |
commit | 12949b390b63940e053a597c16ab4885b6be0dc7 (patch) | |
tree | 6c5679818969dd237f258f1962ceaed222df7ac9 /libs/ardour/ardour/diskstream.h | |
parent | e3897af5e3a8c9d73fb48ae0df87d962d24db455 (diff) |
allow automation-follows-relevant-regions again
git-svn-id: svn://localhost/ardour2/branches/3.0@5285 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/diskstream.h')
-rw-r--r-- | libs/ardour/ardour/diskstream.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index ea5e748ebd..8a51a3d570 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -54,6 +54,7 @@ class IO; class Playlist; class Processor; class Region; +class Route; class Send; class Session; @@ -73,8 +74,8 @@ class Diskstream : public SessionObject, public boost::noncopyable bool set_name (const std::string& str); - ARDOUR::IO* io() const { return _io; } - void set_io (ARDOUR::IO& io); + boost::shared_ptr<ARDOUR::IO> io() const { return _io; } + void set_route (ARDOUR::Route&); virtual float playback_buffer_load() const = 0; virtual float capture_buffer_load() const = 0; @@ -250,7 +251,8 @@ class Diskstream : public SessionObject, public boost::noncopyable uint32_t i_am_the_modifier; - ARDOUR::IO* _io; + boost::shared_ptr<ARDOUR::IO> _io; + Route* _route; ChanCount _n_channels; boost::shared_ptr<Playlist> _playlist; @@ -312,6 +314,8 @@ class Diskstream : public SessionObject, public boost::noncopyable sigc::connection plregion_connection; Flag _flags; + + void route_going_away (); }; }; /* namespace ARDOUR */ |