smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: whitespace

Browse source
This commit is contained in:
Robin Gareus 2019-04-28 21:16:50 +02:00
parent 20bdf5d966
commit a156d4f446
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libs/ardour/convolver.cc
View file

@ -74,7 +74,7 @@ Convolver::Convolver (
boost::shared_ptr<SrcFileSource> sfs (new SrcFileSource(_session, afs, ARDOUR::SrcBest)); boost::shared_ptr<SrcFileSource> sfs (new SrcFileSource(_session, afs, ARDOUR::SrcBest));
_readables.push_back(sfs); _readables.push_back(sfs);
} else { } else {
_readables.push_back(afs); _readables.push_back (afs);
} }
} catch (failed_constructor& err) { } catch (failed_constructor& err) {
PBD::error << string_compose(_("Convolver: Could not open IR \"%1\"."), path) << endmsg; PBD::error << string_compose(_("Convolver: Could not open IR \"%1\"."), path) << endmsg;
@ -106,7 +106,7 @@ Convolver::reconfigure ()
_max_size = _readables[0]->readable_length (); _max_size = _readables[0]->readable_length ();
uint32_t power_of_two; uint32_t power_of_two;
for (power_of_two = 1; 1U << power_of_two < _n_samples; ++power_of_two); for (power_of_two = 1; 1U << power_of_two < _n_samples; ++power_of_two) ;
_n_samples = 1 << power_of_two; _n_samples = 1 << power_of_two;
int n_part = std::min ((uint32_t)Convproc::MAXPART, 4 * _n_samples); int n_part = std::min ((uint32_t)Convproc::MAXPART, 4 * _n_samples);
@ -135,10 +135,6 @@ Convolver::reconfigure ()
uint32_t n_imp = n_inputs () * n_outputs (); uint32_t n_imp = n_inputs () * n_outputs ();
uint32_t n_chn = _readables.size (); uint32_t n_chn = _readables.size ();
#ifndef NDEBUG
printf ("Convolver::reconfigure Nin %d Nout %d Nimp %d Nchn %d\n", n_inputs (), n_outputs (), n_imp, n_chn);
#endif
if (_irc == Stereo && n_chn == 3) { if (_irc == Stereo && n_chn == 3) {
/* ignore 3rd channel */ /* ignore 3rd channel */
n_chn = 2; n_chn = 2;
@ -148,6 +144,10 @@ Convolver::reconfigure ()
n_imp = 2; n_imp = 2;
} }
#ifndef NDEBUG
printf ("Convolver::reconfigure Nin=%d Nout=%d Nimp=%d Nchn=%d\n", n_inputs (), n_outputs (), n_imp, n_chn);
#endif
assert (n_imp <= 4); assert (n_imp <= 4);
for (uint32_t c = 0; c < n_imp && rv == 0; ++c) { for (uint32_t c = 0; c < n_imp && rv == 0; ++c) {
@ -178,14 +178,15 @@ Convolver::reconfigure ()
const uint32_t chan_delay = _ir_settings.pre_delay + _ir_settings.channel_delay[c]; const uint32_t chan_delay = _ir_settings.pre_delay + _ir_settings.channel_delay[c];
#ifndef NDEBUG #ifndef NDEBUG
printf ("Convolver map: IR-chn %d: in %d -> out %d (gain: %.1fdB delay; %d)\n", ir_c + 1, io_i + 1, io_o + 1, 20.f * log10f(chan_gain), chan_delay); printf ("Convolver map: IR-chn %d: in %d -> out %d (gain: %.1fdB delay; %d)\n", ir_c + 1, io_i + 1, io_o + 1, 20.f * log10f (chan_gain), chan_delay);
#endif #endif
uint32_t pos = 0; uint32_t pos = 0;
while (true) { while (true) {
float ir[8192]; float ir[8192];
samplecnt_t to_read = std::min ((uint32_t)8192, _max_size - pos); samplecnt_t to_read = std::min ((uint32_t)8192, _max_size - pos);
samplecnt_t ns = r->read (ir, pos, to_read, 0); samplecnt_t ns = r->read (ir, pos, to_read, 0);
if (ns == 0) { if (ns == 0) {
assert (pos == _max_size); assert (pos == _max_size);