smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

fixed double application of gain on tracks/busses with bypassed panners

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@990 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Jesse Chappell 2006-10-17 21:45:20 +00:00
parent 33e626bad7
commit bebd86d208
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/io.h
View file

@ -273,7 +273,9 @@ public:
Connection* _output_connection; Connection* _output_connection;
bool no_panner_reset; bool no_panner_reset;
XMLNode* deferred_state; XMLNode* deferred_state;
DataType _default_type; DataType _default_type;
bool _ignore_gain_on_deliver;
virtual void set_deferred_state() {} virtual void set_deferred_state() {}

7
libs/ardour/io.cc
View file

@ -125,7 +125,8 @@ IO::IO (Session& s, string name,
deferred_state = 0; deferred_state = 0;
apply_gain_automation = false; apply_gain_automation = false;
_ignore_gain_on_deliver = false;
_gain_automation_state = Off; _gain_automation_state = Off;
_gain_automation_style = Absolute; _gain_automation_style = Absolute;
@ -431,7 +432,7 @@ IO::deliver_output_no_pan (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nfr
gain_t dg; gain_t dg;
gain_t old_gain = _gain; gain_t old_gain = _gain;
if (apply_gain_automation) { if (apply_gain_automation || _ignore_gain_on_deliver) {
/* gain has already been applied by automation code. do nothing here except /* gain has already been applied by automation code. do nothing here except
speed quietning. speed quietning.
@ -498,7 +499,7 @@ IO::deliver_output_no_pan (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nfr
_gain = dg; _gain = dg;
} }
if (apply_gain_automation) { if (apply_gain_automation || _ignore_gain_on_deliver) {
_gain = old_gain; _gain = old_gain;
} }
} }

3
libs/ardour/route.cc
View file

@ -89,7 +89,8 @@ Route::init ()
_declickable = false; _declickable = false;
_pending_declick = true; _pending_declick = true;
_remote_control_id = 0; _remote_control_id = 0;
_ignore_gain_on_deliver = true;
_edit_group = 0; _edit_group = 0;
_mix_group = 0; _mix_group = 0;