diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
| commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
| tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /libs/ardour/ardour/delivery.h | |
| parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) | |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/delivery.h')
| -rw-r--r-- | libs/ardour/ardour/delivery.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index e1aa389df7..99893976ba 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -30,7 +30,9 @@ namespace ARDOUR { class BufferSet; class IO; class MuteMaster; +class PannerShell; class Panner; +class Pannable; class Delivery : public IOProcessor { @@ -52,11 +54,11 @@ public: /* Delivery to an existing output */ - Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role); + Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role); /* Delivery to a new output owned by this object */ - Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role); + Delivery (Session& s, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role); ~Delivery (); bool set_name (const std::string& name); @@ -90,15 +92,14 @@ public: static int disable_panners (void); static int reset_panners (void); - boost::shared_ptr<Panner> panner() const { return _panner; } + boost::shared_ptr<PannerShell> panner_shell() const { return _panshell; } + boost::shared_ptr<Panner> panner() const; void reset_panner (); void defer_pan_reset (); void allow_pan_reset (); uint32_t pans_required() const { return _configured_input.n_audio(); } - void start_pan_touch (uint32_t which, double when); - void end_pan_touch (uint32_t which, bool mark, double when); protected: Role _role; @@ -108,7 +109,7 @@ public: bool _no_outs_cuz_we_no_monitor; boost::shared_ptr<MuteMaster> _mute_master; bool no_panner_reset; - boost::shared_ptr<Panner> _panner; + boost::shared_ptr<PannerShell> _panshell; static bool panners_legal; static PBD::Signal0<int> PannersLegal; |