diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-14 19:00:08 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-14 19:00:08 +0000 |
| commit | 19610514166e42a3c860accf576beb3ac1381a42 (patch) | |
| tree | 2e6d00995428aed7188f7fab774230f01d438b9e /libs/ardour/ardour | |
| parent | a5674e92712aacae648e8d55ec7b767b6d988542 (diff) | |
monitor send gets access to the (shared) pannable of the track/bus, thus ensuring that the monitor feed is panned. required a few fixes along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9731 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/delivery.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/internal_send.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 789f1847ba..4501e58b4b 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -74,7 +74,7 @@ public: void flush_buffers (framecnt_t nframes, framepos_t time); void no_outs_cuz_we_no_monitor(bool); - void cycle_start (pframes_t); + virtual void cycle_start (pframes_t); void transport_stopped (framepos_t frame); void realtime_locate (); diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h index 39dca9a6be..c2cf4b7990 100644 --- a/libs/ardour/ardour/internal_send.h +++ b/libs/ardour/ardour/internal_send.h @@ -39,6 +39,7 @@ class InternalSend : public Send XMLNode& get_state(void); int set_state(const XMLNode& node, int version); + void cycle_start (pframes_t); void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool); bool feeds (boost::shared_ptr<Route> other) const; bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const; @@ -52,6 +53,8 @@ class InternalSend : public Send return mixbufs; } + void set_can_pan (bool yn); + private: BufferSet mixbufs; boost::shared_ptr<Route> _send_to; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index d7f76cbf24..fb6d66a246 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -215,7 +215,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, /* special processors */ - boost::shared_ptr<Delivery> monitor_send() const { return _monitor_send; } + boost::shared_ptr<InternalSend> monitor_send() const { return _monitor_send; } boost::shared_ptr<Delivery> main_outs() const { return _main_outs; } boost::shared_ptr<InternalReturn> internal_return() const { return _intreturn; } boost::shared_ptr<MonitorProcessor> monitor_control() const { return _monitor_control; } @@ -438,7 +438,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, ProcessorList _processors; mutable Glib::RWLock _processor_lock; boost::shared_ptr<Delivery> _main_outs; - boost::shared_ptr<Delivery> _monitor_send; + boost::shared_ptr<InternalSend> _monitor_send; boost::shared_ptr<InternalReturn> _intreturn; boost::shared_ptr<MonitorProcessor> _monitor_control; boost::shared_ptr<Pannable> _pannable; |