diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-18 17:51:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-18 17:51:57 +0000 |
| commit | 9524b08752f22684c472acd5b3184d5c786e7103 (patch) | |
| tree | ff2b5d4fae547d96f7f6ee67327972781a6c752e /libs/ardour/ardour/route.h | |
| parent | 8983d84fb2668bb54383e8148c45ef75af93d360 (diff) | |
fix two major assert failures arising from the optional monitor section commit; separate numbering of aux sends, sends and listens to fix #3671 (still testing, but the assert failures are critical)
git-svn-id: svn://localhost/ardour2/branches/3.0@11263 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/route.h')
| -rw-r--r-- | libs/ardour/ardour/route.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index e41682dd8e..1724439dc2 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -163,7 +163,6 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, void set_listen (bool yn, void* src); bool listening_via_monitor () const; void enable_monitor_send (); - void disable_monitor_send (); void set_phase_invert (uint32_t, bool yn); void set_phase_invert (boost::dynamic_bitset<>); @@ -305,9 +304,8 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, PBD::Signal1<void,void*> SelectedChanged; - int listen_via_monitor (); - int listen_via (boost::shared_ptr<Route>, Placement p); - void drop_listen (boost::shared_ptr<Route>); + int add_aux_send (boost::shared_ptr<Route>, Placement p); + void remove_aux_or_listen (boost::shared_ptr<Route>); /** * return true if this route feeds the first argument via at least one |