M src/finer/Guide.h +8 -10
@@ 457,7 457,7 @@ public:
<< guidance.phaseReset.f0 << " to " << guidance.phaseReset.f1
<< "]" << std::endl;
- m_log.log(1, str.str().c_str());
+ m_log.log(2, str.str().c_str());
*/
}
@@ 478,7 478,9 @@ protected:
double m_maxHigher;
void updateForSilence(Guidance &guidance) const {
-// std::cout << "phase reset on silence" << std::endl;
+
+ m_log.log(2, "Guide::updateForSilence");
+
double nyquist = m_parameters.sampleRate / 2.0;
if (!m_parameters.singleWindowMode) {
guidance.fftBands[0].f0 = 0.0;
@@ 498,7 500,7 @@ protected:
const BinSegmenter::Segmentation &segmentation,
bool realtime) const {
-// std::cout << "unity" << std::endl;
+ m_log.log(2, "Guide::updateForUnity: realtime and single-window mode", (int)realtime, m_parameters.singleWindowMode);
double nyquist = m_parameters.sampleRate / 2.0;
@@ 533,9 535,9 @@ protected:
if (!hadPhaseReset) {
guidance.phaseReset.f0 = 16000.0;
guidance.phaseReset.f1 = nyquist;
-// std::cout << "f0 = " << guidance.phaseReset.f0 << std::endl;
return;
} else {
+ m_log.log(2, "Guide::updateForUnity: had phase reset");
guidance.phaseReset.f0 *= 0.9;
guidance.phaseReset.f1 *= 1.1;
}
@@ 552,12 554,8 @@ protected:
if (guidance.phaseReset.f0 < 100.0) {
guidance.phaseReset.f0 = 0.0;
}
-/*
- if (guidance.phaseReset.f0 > 0.0) {
- std::cout << "unity: f0 = " << guidance.phaseReset.f0
- << ", f1 = " << guidance.phaseReset.f1 << std::endl;
- }
-*/
+
+ m_log.log(2, "Guide::updateForUnity: f0 and f1", guidance.phaseReset.f0, guidance.phaseReset.f1);
}
bool checkPotentialKick(const process_t *const magnitudes,
M src/finer/R3LiveShifter.cpp +3 -0
@@ 249,6 249,7 @@ R3LiveShifter::measureResamplerDelay()
m_inResampler->reset();
m_resamplerDelay = bs - outcount;
+
m_log.log(1, "R3LiveShifter::measureResamplerDelay: measured delay and outcount ", m_resamplerDelay, outcount);
}
@@ 1149,6 1150,8 @@ R3LiveShifter::synthesiseChannel(int c,
process_t winscale = process_t(outhop) / scaleData->windowScaleFactor;
+ m_log.log(2, "R3LiveShifter::synthesiseChannel: outhop and winscale", outhop, winscale);
+
// The frequency filter is applied naively in the frequency
// domain. Aliasing is reduced by the shorter resynthesis
// window. We resynthesise each scale individually, then sum -