react-native-tuner-engine 1.0.0 → 1.1.0

package/cpp/include/AudioFrameDispatcher.hpp

@@ -48,6 +48,8 @@ public:
     void setFrequencyRange(float minHz, float maxHz);
     void setInstrument(const std::string& name);
     void setTuning(const std::string& name);
+    void setTemperament(const std::string& name);
+    void setAdaptiveFrameSize(bool enabled);
     void setPostProcessorConfig(PostProcessor::Config cfg);
     void setHpfCutoff(float hz);
     void setOnsetDetectionEnabled(bool enabled);
@@ -66,6 +68,7 @@ public:
 private:
     void workerLoop();
     void recomputeHopSize();
+    void applyStoredSettings(); // re-apply cached settings after engine recreation
 
     static constexpr unsigned kRingCapacity = 32768u; // ~680ms at 48kHz — plenty of headroom
 
@@ -73,6 +76,7 @@ private:
     int hopSize_;
     float overlapRatio_;
     float sampleRate_;
+    bool adaptiveFrameSize_{true}; // auto-resize frame on setInstrument
     PitchCallback callback_;
 
     FloatRingBuffer<kRingCapacity> ring_;
@@ -82,6 +86,19 @@ private:
     mutable std::mutex engineMutex_; // protects engine_ access across threads
     std::unique_ptr<TunerEngine> engine_;
 
+    // Cached settings — re-applied after engine recreation (setSampleRate / reconfigure)
+    std::string currentInstrument_;
+    std::string currentTuning_;
+    std::string currentTemperament_;
+    float currentA4_{440.0f};
+    float currentNoiseGateDb_{-55.0f};
+    float currentConfidenceThreshold_{0.75f};
+    float currentMinHz_{60.0f};
+    float currentMaxHz_{1200.0f};
+    float currentHpfCutoff_{70.0f};
+    bool currentOnsetEnabled_{false};
+    PostProcessor::Config currentPostCfg_{};
+
     std::thread workerThread_;
     std::atomic<bool> running_{false};
 };

package/cpp/include/NoteMapper.hpp

@@ -2,6 +2,8 @@
 
 #include "PitchResult.hpp"
 
+#include <string>
+
 class NoteMapper {
 public:
     explicit NoteMapper(float a4 = 440.0f);
@@ -9,7 +11,26 @@ public:
     PitchResult map(float frequency, float confidence, float rmsDb) const;
 
     void setA4(float value);
+    void setTemperament(const std::string& name); // "equal" or "just"
 
 private:
     float a4_;
+    bool useJust_ = false;
+
+    // Cents offset from equal temperament for each pitch class (C=0..B=11)
+    // using 5-limit just intonation with C as root.
+    static constexpr float kJustCentsOffset[12] = {
+        0.0f,      // C   1/1
+        11.73f,    // C#  16/15
+        3.91f,     // D   9/8
+        15.64f,    // D#  6/5
+        -13.69f,   // E   5/4
+        -1.96f,    // F   4/3
+        -9.78f,    // F#  45/32
+        1.96f,     // G   3/2
+        13.69f,    // G#  8/5
+        -15.64f,   // A   5/3
+        17.60f,    // A#  9/5
+        -11.73f,   // B   15/8
+    };
 };

package/cpp/include/Pipeline.hpp

@@ -27,6 +27,7 @@ public:
     void setFrequencyRange(float minHz, float maxHz);
     void setInstrument(const std::string& name);
     void setTuning(const std::string& name);   // e.g. "guitar_standard", "" to disable
+    void setTemperament(const std::string& name); // "equal" or "just"
     void setPostProcessorConfig(PostProcessor::Config cfg);
     void setHpfCutoff(float hz);
     void setOnsetDetectionEnabled(bool enabled);

package/cpp/include/TunerEngine.hpp

@@ -22,6 +22,7 @@ public:
     void setFrequencyRange(float minFrequency, float maxFrequency);
     void setInstrument(const std::string& name);
     void setTuning(const std::string& name);
+    void setTemperament(const std::string& name);
     void setPostProcessorConfig(PostProcessor::Config cfg);
     void setHpfCutoff(float hz);
     void setOnsetDetectionEnabled(bool enabled);

package/cpp/src/AudioFrameDispatcher.cpp

@@ -51,56 +51,79 @@ void AudioFrameDispatcher::setSampleRate(float sampleRate) {
     std::lock_guard<std::mutex> lock(engineMutex_);
     sampleRate_ = sampleRate;
     engine_ = std::make_unique<TunerEngine>(sampleRate, frameSize_);
+    applyStoredSettings();
 }
 
 void AudioFrameDispatcher::setA4(float hz) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentA4_ = hz;
     if (engine_) engine_->setA4(hz);
 }
 
 void AudioFrameDispatcher::setNoiseGateDb(float db) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentNoiseGateDb_ = db;
     if (engine_) engine_->setNoiseGateDb(db);
 }
 
 void AudioFrameDispatcher::setConfidenceThreshold(float value) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentConfidenceThreshold_ = value;
     if (engine_) engine_->setConfidenceThreshold(value);
 }
 
 void AudioFrameDispatcher::setFrequencyRange(float minHz, float maxHz) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentMinHz_ = minHz;
+    currentMaxHz_ = maxHz;
     if (engine_) engine_->setFrequencyRange(minHz, maxHz);
 }
 
 void AudioFrameDispatcher::setInstrument(const std::string& name) {
-    // Check if the instrument's recommended frame size differs
-    const int recommended = instrumentRecommendedFrameSize(name);
-    if (recommended != frameSize_) {
-        reconfigure(recommended, sampleRate_);
+    // Auto-resize frame only if adaptive frame sizing is enabled
+    if (adaptiveFrameSize_) {
+        const int recommended = instrumentRecommendedFrameSize(name);
+        if (recommended != frameSize_) {
+            reconfigure(recommended, sampleRate_);
+        }
     }
 
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentInstrument_ = name;
     if (engine_) engine_->setInstrument(name);
 }
 
 void AudioFrameDispatcher::setTuning(const std::string& name) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentTuning_ = name;
     if (engine_) engine_->setTuning(name);
 }
 
+void AudioFrameDispatcher::setTemperament(const std::string& name) {
+    std::lock_guard<std::mutex> lock(engineMutex_);
+    currentTemperament_ = name;
+    if (engine_) engine_->setTemperament(name);
+}
+
+void AudioFrameDispatcher::setAdaptiveFrameSize(bool enabled) {
+    adaptiveFrameSize_ = enabled;
+}
+
 void AudioFrameDispatcher::setPostProcessorConfig(PostProcessor::Config cfg) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentPostCfg_ = cfg;
     if (engine_) engine_->setPostProcessorConfig(cfg);
 }
 
 void AudioFrameDispatcher::setHpfCutoff(float hz) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentHpfCutoff_ = hz;
     if (engine_) engine_->setHpfCutoff(hz);
 }
 
 void AudioFrameDispatcher::setOnsetDetectionEnabled(bool enabled) {
     std::lock_guard<std::mutex> lock(engineMutex_);
+    currentOnsetEnabled_ = enabled;
     if (engine_) engine_->setOnsetDetectionEnabled(enabled);
 }
 
@@ -116,6 +139,21 @@ void AudioFrameDispatcher::setOverlapRatio(float ratio) {
     firstFrame_ = true; // reset sliding window state
 }
 
+void AudioFrameDispatcher::applyStoredSettings() {
+    // Called with engineMutex_ already held after engine recreation
+    if (!engine_) return;
+    engine_->setA4(currentA4_);
+    engine_->setNoiseGateDb(currentNoiseGateDb_);
+    engine_->setConfidenceThreshold(currentConfidenceThreshold_);
+    engine_->setFrequencyRange(currentMinHz_, currentMaxHz_);
+    engine_->setHpfCutoff(currentHpfCutoff_);
+    engine_->setPostProcessorConfig(currentPostCfg_);
+    engine_->setOnsetDetectionEnabled(currentOnsetEnabled_);
+    if (!currentInstrument_.empty()) engine_->setInstrument(currentInstrument_);
+    if (!currentTuning_.empty()) engine_->setTuning(currentTuning_);
+    if (!currentTemperament_.empty()) engine_->setTemperament(currentTemperament_);
+}
+
 void AudioFrameDispatcher::reconfigure(int newFrameSize, float sampleRate) {
     const bool wasRunning = running_.load();
     if (wasRunning) stop();
@@ -128,6 +166,7 @@ void AudioFrameDispatcher::reconfigure(int newFrameSize, float sampleRate) {
         frameBuffer_.assign(static_cast<size_t>(frameSize_), 0.0f);
         firstFrame_ = true;
         engine_ = std::make_unique<TunerEngine>(sampleRate_, frameSize_);
+        applyStoredSettings();
     }
 
     if (wasRunning) start();

package/cpp/src/NoteMapper.cpp

@@ -14,6 +14,10 @@ void NoteMapper::setA4(float value) {
     a4_ = value;
 }
 
+void NoteMapper::setTemperament(const std::string& name) {
+    useJust_ = (name == "just");
+}
+
 PitchResult NoteMapper::map(float frequency, float confidence, float rmsDb) const {
     PitchResult result;
 
@@ -30,7 +34,15 @@ PitchResult NoteMapper::map(float frequency, float confidence, float rmsDb) cons
         std::round(69.0f + 12.0f * std::log2(frequency / a4_))
     );
 
-    const float target = a4_ * std::pow(2.0f, (midi - 69) / 12.0f);
+    // Equal-temperament target
+    float target = a4_ * std::pow(2.0f, (midi - 69) / 12.0f);
+
+    // Apply just-intonation offset if enabled
+    if (useJust_) {
+        const int pitchClass = ((midi % 12) + 12) % 12; // 0=C .. 11=B
+        target *= std::pow(2.0f, kJustCentsOffset[pitchClass] / 1200.0f);
+    }
+
     const float cents = 1200.0f * std::log2(frequency / target);
 
     result.hasPitch = true;
@@ -38,7 +50,7 @@ PitchResult NoteMapper::map(float frequency, float confidence, float rmsDb) cons
     result.confidence = confidence;
     result.rmsDb = rmsDb;
     result.midiNote = midi;
-    result.noteName = names[midi % 12];
+    result.noteName = names[((midi % 12) + 12) % 12];
     result.octave = midi / 12 - 1;
     result.targetFrequency = target;
     result.cents = cents;

package/cpp/src/Pipeline.cpp

@@ -103,6 +103,10 @@ void Pipeline::setTuning(const std::string& name) {
     stringMatcher_.setTuning(name.empty() ? nullptr : tuningPreset(name));
 }
 
+void Pipeline::setTemperament(const std::string& name) {
+    noteMapper_.setTemperament(name);
+}
+
 void Pipeline::setPostProcessorConfig(PostProcessor::Config cfg) {
     postProcessor_.setConfig(cfg);
 }

package/cpp/src/TunerEngine.cpp

@@ -50,6 +50,10 @@ void TunerEngine::setTuning(const std::string& name) {
     pipeline_->setTuning(name);
 }
 
+void TunerEngine::setTemperament(const std::string& name) {
+    pipeline_->setTemperament(name);
+}
+
 void TunerEngine::setPostProcessorConfig(PostProcessor::Config cfg) {
     pipeline_->setPostProcessorConfig(cfg);
 }

package/cpp/tests/build/CMakeFiles/Makefile.cmake

@@ -11,86 +11,24 @@ set(CMAKE_MAKEFILE_DEPENDS
   "/Users/deniz.yesilirmak/Documents/personal/react-native-tuner-engine/cpp/tests/CMakeLists.txt"
   "CMakeFiles/4.3.2/CMakeCXXCompiler.cmake"
   "CMakeFiles/4.3.2/CMakeSystem.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeCXXCompiler.cmake.in"
-  "/opt/homebrew/share/cmake/Modules/CMakeCXXCompilerABI.cpp"
   "/opt/homebrew/share/cmake/Modules/CMakeCXXInformation.cmake"
   "/opt/homebrew/share/cmake/Modules/CMakeCommonLanguageInclude.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeCompilerIdDetection.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeDetermineCXXCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeDetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeDetermineCompilerABI.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeDetermineCompilerId.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeDetermineCompilerSupport.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeDetermineSystem.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeFindBinUtils.cmake"
   "/opt/homebrew/share/cmake/Modules/CMakeGenericSystem.cmake"
   "/opt/homebrew/share/cmake/Modules/CMakeInitializeConfigs.cmake"
   "/opt/homebrew/share/cmake/Modules/CMakeLanguageInformation.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeParseLibraryArchitecture.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeSystem.cmake.in"
   "/opt/homebrew/share/cmake/Modules/CMakeSystemSpecificInformation.cmake"
   "/opt/homebrew/share/cmake/Modules/CMakeSystemSpecificInitialize.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeTestCXXCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeTestCompilerCommon.cmake"
-  "/opt/homebrew/share/cmake/Modules/CMakeUnixFindMake.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/ADSP-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/ARMClang-DetermineCompiler.cmake"
   "/opt/homebrew/share/cmake/Modules/Compiler/AppleClang-CXX.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Borland-DetermineCompiler.cmake"
   "/opt/homebrew/share/cmake/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Clang-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
   "/opt/homebrew/share/cmake/Modules/Compiler/Clang.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Cray-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/CrayClang-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Diab-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/GHS-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake"
   "/opt/homebrew/share/cmake/Modules/Compiler/GNU.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/IAR-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Intel-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/NVHPC-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/OrangeC-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/PGI-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/PathScale-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Renesas-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/SCO-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/TI-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/TIClang-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Tasking-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/Watcom-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake"
-  "/opt/homebrew/share/cmake/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
   "/opt/homebrew/share/cmake/Modules/Internal/CMakeCXXLinkerInformation.cmake"
   "/opt/homebrew/share/cmake/Modules/Internal/CMakeCommonLinkerInformation.cmake"
-  "/opt/homebrew/share/cmake/Modules/Internal/CMakeDetermineLinkerId.cmake"
-  "/opt/homebrew/share/cmake/Modules/Internal/CMakeInspectCXXLinker.cmake"
-  "/opt/homebrew/share/cmake/Modules/Internal/FeatureTesting.cmake"
   "/opt/homebrew/share/cmake/Modules/Linker/AppleClang-CXX.cmake"
   "/opt/homebrew/share/cmake/Modules/Linker/AppleClang.cmake"
   "/opt/homebrew/share/cmake/Modules/Platform/Apple-AppleClang-CXX.cmake"
   "/opt/homebrew/share/cmake/Modules/Platform/Apple-Clang-CXX.cmake"
   "/opt/homebrew/share/cmake/Modules/Platform/Apple-Clang.cmake"
-  "/opt/homebrew/share/cmake/Modules/Platform/Darwin-Determine-CXX.cmake"
   "/opt/homebrew/share/cmake/Modules/Platform/Darwin-Initialize.cmake"
   "/opt/homebrew/share/cmake/Modules/Platform/Darwin.cmake"
   "/opt/homebrew/share/cmake/Modules/Platform/Linker/Apple-AppleClang-CXX.cmake"
@@ -106,10 +44,6 @@ set(CMAKE_MAKEFILE_OUTPUTS
 
 # Byproducts of CMake generate step:
 set(CMAKE_MAKEFILE_PRODUCTS
-  "CMakeFiles/4.3.2/CMakeSystem.cmake"
-  "CMakeFiles/4.3.2/CMakeCXXCompiler.cmake"
-  "CMakeFiles/4.3.2/CMakeCXXCompiler.cmake"
-  "CMakeFiles/4.3.2/CMakeCXXCompiler.cmake"
   "CMakeFiles/CMakeDirectoryInformation.cmake"
   "tuner_engine_core/CMakeFiles/CMakeDirectoryInformation.cmake"
   )