diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-08 02:56:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-01-08 02:56:49 +0000 |
| commit | a20f41ab39cc034740ccd564c1057d8737d763d5 (patch) | |
| tree | 6f713470d72ec04ad03efb1ad6380717476c29fd /libs/ardour/route.cc | |
| parent | 1186b1d881fac3d1d1b55954b84b958c988501c4 (diff) | |
a metric ton of changes
git-svn-id: svn://localhost/trunk/ardour2@246 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 6e07ef90f2..5fcbd53bb6 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -86,6 +86,7 @@ Route::init () _have_internal_generator = false; _declickable = false; _pending_declick = true; + _remote_control_id = 0; _edit_group = 0; _mix_group = 0; @@ -118,6 +119,21 @@ Route::~Route () } } +void +Route::set_remote_control_id (uint32_t id) +{ + if (id != _remote_control_id) { + _remote_control_id = id; + RemoteControlIDChanged (); + } +} + +uint32_t +Route::remote_control_id() const +{ + return _remote_control_id; +} + long Route::order_key (string name) const { @@ -213,7 +229,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs, IO *co; bool mute_audible; bool solo_audible; - bool no_monitor = (Config->get_use_hardware_monitoring() || Config->get_no_sw_monitoring ()); + bool no_monitor = (Config->get_use_hardware_monitoring() || !Config->get_use_sw_monitoring ()); gain_t* gab = _session.gain_automation_buffer(); declick = _pending_declick; @@ -406,7 +422,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs, // AND software monitoring required - !Config->get_no_sw_monitoring())) { + Config->get_use_sw_monitoring())) { if (apply_gain_automation) { |