Start reworking log output

src/common/Log.h

@@ -0,0 +1,99 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Rubber Band Library
+    An audio time-stretching and pitch-shifting library.
+    Copyright 2007-2022 Particular Programs Ltd.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+
+    Alternatively, if you have a valid commercial licence for the
+    Rubber Band Library obtained by agreement with the copyright
+    holders, you may redistribute and/or modify it under the terms
+    described in that licence.
+
+    If you wish to distribute code using the Rubber Band Library
+    under terms other than those of the GNU General Public License,
+    you must obtain a valid commercial licence before doing so.
+*/
+
+#ifndef RUBBERBAND_LOG_H
+#define RUBBERBAND_LOG_H
+
+#include <functional>
+#include <iostream>
+
+namespace RubberBand {
+
+class Log {
+public:
+    Log(std::function<void(const char *)> _log0,
+        std::function<void(const char *, double)> _log1,
+        std::function<void(const char *, double, double)> _log2) :
+        m_log0(_log0),
+        m_log1(_log1),
+        m_log2(_log2),
+        m_debugLevel(m_defaultDebugLevel) { }
+
+    Log(const Log &other) :
+        m_log0(other.m_log0),
+        m_log1(other.m_log1),
+        m_log2(other.m_log2),
+        m_debugLevel(other.m_debugLevel) { }
+
+    Log &operator=(const Log &other) {
+        m_log0 = other.m_log0;
+        m_log1 = other.m_log1;
+        m_log2 = other.m_log2;
+        m_debugLevel = other.m_debugLevel;
+        return *this;
+    }
+
+    void setDebugLevel(int level) { m_debugLevel = level; }
+    int getDebugLevel() const { return m_debugLevel; }
+
+    static void setDefaultDebugLevel(int level) { m_defaultDebugLevel = level; }
+    
+    void log0(int level, const char *message) const {
+        if (level <= m_debugLevel) m_log0(message);
+    }
+    void log1(int level, const char *message, double arg0) const {
+        if (level <= m_debugLevel) m_log1(message, arg0);
+    }
+
+    //!!! On reflection, log2 is a dumb choice of name
+    void log2(int level, const char *message, double arg0, double arg1) const {
+        if (level <= m_debugLevel) m_log2(message, arg0, arg1);
+    }
+
+    static Log makeCoutLog() {
+        return Log(
+            [](const char *message) {
+                std::cout << "RubberBand: " << message << "\n";
+            },
+            [](const char *message, double arg0) {
+                std::cout << "RubberBand: " << message
+                          << ": " << arg0 << "\n";
+            },
+            [](const char *message, double arg0, double arg1) {
+                std::cout << "RubberBand: " << message
+                          << ": (" << arg0 << "," << arg1 << ")" << "\n";
+            }
+            );
+    }        
+    
+private:
+    std::function<void(const char *)> m_log0;
+    std::function<void(const char *, double)> m_log1;
+    std::function<void(const char *, double, double)> m_log2;
+    int m_debugLevel;
+    static int m_defaultDebugLevel;
+};
+
+}
+
+#endif

src/common/StretchCalculator.cpp

@@ -37,7 +37,8 @@ namespace RubberBand
 	
 StretchCalculator::StretchCalculator(size_t sampleRate,
                                      size_t inputIncrement,
-                                     bool useHardPeaks) :
+                                     bool useHardPeaks,
+                                     Log log) :
     m_sampleRate(sampleRate),
     m_increment(inputIncrement),
     m_prevDf(0),
@@ -49,7 +50,8 @@ StretchCalculator::StretchCalculator(size_t sampleRate,
     m_useHardPeaks(useHardPeaks),
     m_inFrameCounter(0),
     m_frameCheckpoint(0, 0),
-    m_outFrameCounter(0)
+    m_outFrameCounter(0),
+    m_log(log)
 {
 //    std::cerr << "StretchCalculator::StretchCalculator: useHardPeaks = " << useHardPeaks << std::endl;
 }    

src/common/StretchCalculator.h

@@ -30,13 +30,18 @@
 #include <map>
 #include <cstdint>
 
+#include "Log.h"
+
 namespace RubberBand
 {
 
 class StretchCalculator
 {
 public:
-    StretchCalculator(size_t sampleRate, size_t inputIncrement, bool useHardPeaks);
+    StretchCalculator(size_t sampleRate,
+                      size_t inputIncrement,
+                      bool useHardPeaks,
+                      Log log);
     virtual ~StretchCalculator();
 
     /**
@@ -107,6 +112,7 @@ protected:
     std::pair<int64_t, int64_t> m_frameCheckpoint;
     int64_t expectedOutFrame(int64_t inFrame, double timeRatio);
     double m_outFrameCounter;
+    Log m_log;
 
     std::map<size_t, size_t> m_keyFrameMap;
     std::vector<Peak> m_peaks;