ardour/livetrax
13
0
Fork 0
Code

remove getter for Amp::_apply_automation_gain; reset member to false after use, and true after ::setup_automation_gain

Browse Source 
runs successfully
This commit is contained in:
Paul Davis 2017-09-18 22:21:27 -04:00
parent 40aebce699
commit c8a9b28d3b
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/amp.cc
View File

@ -120,6 +120,11 @@ Amp::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end_sampl
_current_gain = lpf;
}
/* used it, don't do it again until setup_gain_automation() is
called successfully.
*/
_apply_gain_automation = false;
} else { /* manual (scalar) gain */
gain_t const target_gain = _gain_control->get_value();

1
libs/ardour/ardour/amp.h
View File

@ -54,7 +54,6 @@ public:
void setup_gain_automation (samplepos_t start_sample, samplepos_t end_sample, samplecnt_t nframes);
bool apply_gain_automation() const { return _apply_gain_automation; }
void apply_gain_automation(bool yn) { _apply_gain_automation = yn; }
XMLNode& state (bool full);
int set_state (const XMLNode&, int version);

1
libs/ardour/auditioner.cc
View File

@ -232,7 +232,6 @@ Auditioner::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_s
BufferSet& bufs = _session.get_route_buffers (n_process_buffers());
_silent = false;
_amp->apply_gain_automation(false);
if (_queue_panic) {
MidiBuffer& mbuf (bufs.get_midi (0));

6
libs/ardour/route.cc
View File

@ -340,9 +340,6 @@ Route::process_output_buffers (BufferSet& bufs,
start_sample + _trim->output_latency (),
end_sample + _trim->output_latency (),
nframes);
} else {
_amp->apply_gain_automation (false);
_trim->apply_gain_automation (false);
}
/* Tell main outs what to do about monitoring. We do this so that
@ -3585,8 +3582,6 @@ Route::no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sam
_meter->run (bufs, start_sample, end_sample, 0.0, nframes, true);
}
_amp->apply_gain_automation (false);
_trim->apply_gain_automation (false);
passthru (bufs, start_sample, end_sample, nframes, 0, true);
flush_processor_buffers_locked (nframes);
@ -3612,7 +3607,6 @@ Route::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample
}
_silent = false;
_amp->apply_gain_automation(false);
BufferSet& bufs = _session.get_route_buffers (n_process_buffers ());

2
libs/ardour/track.cc
View File

@ -493,8 +493,6 @@ Track::no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sam
be_silent = false;
}
_amp->apply_gain_automation (false);
/* if have_internal_generator, or .. */
if (be_silent) {