diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-14 14:49:06 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-14 14:49:06 +0000 |
commit | a5674e92712aacae648e8d55ec7b767b6d988542 (patch) | |
tree | 4b83ea1c49bc17e9d5fe5ee5a440e71f98ca5105 /libs/ardour/ardour | |
parent | 39c30e174774b1d688e2f820e5477850765c0c88 (diff) |
fix initialization of gain for Listen internal sends (to monitor bus); remove pannable object from monitor bus after (re)creation from XML
git-svn-id: svn://localhost/ardour2/branches/3.0@9730 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/delivery.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/internal_send.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/route.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 0e55356928..789f1847ba 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -95,6 +95,7 @@ public: boost::shared_ptr<PannerShell> panner_shell() const { return _panshell; } boost::shared_ptr<Panner> panner() const; + void unpan (); void reset_panner (); void defer_pan_reset (); void allow_pan_reset (); diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h index c7969e9f19..39dca9a6be 100644 --- a/libs/ardour/ardour/internal_send.h +++ b/libs/ardour/ardour/internal_send.h @@ -62,7 +62,7 @@ class InternalSend : public Send void send_to_going_away (); void send_to_property_changed (const PBD::PropertyChange&); int connect_when_legal (); - int set_our_state (XMLNode const &, int); + void init_gain (); int use_target (boost::shared_ptr<Route>); }; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 3b12e4f600..d7f76cbf24 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -526,6 +526,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, framecnt_t update_port_latencies (PortSet& ports, PortSet& feeders, bool playback, framecnt_t) const; void setup_invisible_processors (); + void unpan (); boost::shared_ptr<CapturingProcessor> _capturing_processor; |