react-native-tuner-engine 1.0.0 → 1.1.0

package/android/src/main/cpp/TunerEngineJni.cpp

@@ -217,4 +217,20 @@ Java_com_tunerengine_TunerEngineModule_nativeSetOnsetDetection(
     if (gDispatcher) gDispatcher->setOnsetDetectionEnabled(static_cast<bool>(enabled));
 }
 
+JNIEXPORT void JNICALL
+Java_com_tunerengine_TunerEngineModule_nativeSetTemperament(
+    JNIEnv* env, jobject /*thiz*/, jstring name
+) {
+    const char* nameChars = env->GetStringUTFChars(name, nullptr);
+    if (gDispatcher && nameChars) gDispatcher->setTemperament(std::string(nameChars));
+    env->ReleaseStringUTFChars(name, nameChars);
+}
+
+JNIEXPORT void JNICALL
+Java_com_tunerengine_TunerEngineModule_nativeSetAdaptiveFrameSize(
+    JNIEnv* /*env*/, jobject /*thiz*/, jboolean enabled
+) {
+    if (gDispatcher) gDispatcher->setAdaptiveFrameSize(static_cast<bool>(enabled));
+}
+
 } // extern "C"

package/android/src/main/java/com/tunerengine/TunerEngineModule.kt

@@ -3,13 +3,11 @@ package com.tunerengine
 import android.Manifest
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
-import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
-import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.modules.core.PermissionAwareActivity
 import com.facebook.react.modules.core.PermissionListener
 
@@ -18,41 +16,68 @@ class TunerEngineModule(reactContext: ReactApplicationContext) :
 
   private var isRunning = false
 
+  // Latest pitch data written by the C++ worker thread, read by JS via getStatus()
+  @Volatile private var latestHasPitch = false
+  @Volatile private var latestFrequency = 0f
+  @Volatile private var latestConfidence = 0f
+  @Volatile private var latestRmsDb = 0f
+  @Volatile private var latestNoteName = ""
+  @Volatile private var latestOctave = 0
+  @Volatile private var latestCents = 0f
+  @Volatile private var latestNearestString = ""
+  @Volatile private var latestStringDeviation = 0f
+  @Volatile private var pitchSequence = 0L  // monotonic counter for change detection
+
   override fun configure(opts: ReadableMap?, promise: Promise) {
-    val sampleRate = opts?.getDouble("sampleRate")?.toFloat() ?: 48000.0f
-    val frameSize = if (opts?.hasKey("frameSize") == true) opts.getInt("frameSize") else 2048
-    val noiseGateDb = opts?.getDouble("noiseGateDb")?.toFloat() ?: -55.0f
-    val confidenceThreshold = opts?.getDouble("confidenceThreshold")?.toFloat() ?: 0.75f
-    val minFrequency = opts?.getDouble("minFrequency")?.toFloat() ?: 60.0f
-    val maxFrequency = opts?.getDouble("maxFrequency")?.toFloat() ?: 1200.0f
-    val a4 = opts?.getDouble("a4")?.toFloat() ?: 440.0f
-    val overlapRatio = opts?.getDouble("overlapRatio")?.toFloat() ?: 0.0f
-
-    nativeConfigure(sampleRate, frameSize, noiseGateDb, confidenceThreshold, minFrequency, maxFrequency, a4, overlapRatio)
-
-    val hpfCutoffHz = opts?.getDouble("hpfCutoffHz")?.toFloat()
-    if (hpfCutoffHz != null) nativeSetHpfCutoff(hpfCutoffHz)
-
-    val emaAlpha = opts?.getDouble("emaAlpha")?.toFloat()
-    val hysteresisFrames = if (opts?.hasKey("hysteresisFrames") == true) opts.getInt("hysteresisFrames") else null
-    if (emaAlpha != null || hysteresisFrames != null) {
-      nativeSetPostProcessorConfig(emaAlpha ?: 0.35f, hysteresisFrames ?: 3)
-    }
+    try {
+      val sampleRate = if (opts?.hasKey("sampleRate") == true) opts.getDouble("sampleRate").toFloat() else 48000.0f
+      val frameSize = if (opts?.hasKey("frameSize") == true) opts.getInt("frameSize") else 2048
+      val noiseGateDb = if (opts?.hasKey("noiseGateDb") == true) opts.getDouble("noiseGateDb").toFloat() else -55.0f
+      val confidenceThreshold = if (opts?.hasKey("confidenceThreshold") == true) opts.getDouble("confidenceThreshold").toFloat() else 0.75f
+      val minFrequency = if (opts?.hasKey("minFrequency") == true) opts.getDouble("minFrequency").toFloat() else 60.0f
+      val maxFrequency = if (opts?.hasKey("maxFrequency") == true) opts.getDouble("maxFrequency").toFloat() else 1200.0f
+      val a4 = if (opts?.hasKey("a4") == true) opts.getDouble("a4").toFloat() else 440.0f
+      val overlapRatio = if (opts?.hasKey("overlapRatio") == true) opts.getDouble("overlapRatio").toFloat() else 0.0f
+
+      nativeConfigure(sampleRate, frameSize, noiseGateDb, confidenceThreshold, minFrequency, maxFrequency, a4, overlapRatio)
+
+      if (opts?.hasKey("hpfCutoffHz") == true) {
+        nativeSetHpfCutoff(opts.getDouble("hpfCutoffHz").toFloat())
+      }
 
-    if (opts?.hasKey("onsetDetection") == true) {
-      nativeSetOnsetDetection(opts.getBoolean("onsetDetection"))
-    }
+      val hasEma = opts?.hasKey("emaAlpha") == true
+      val hasHyst = opts?.hasKey("hysteresisFrames") == true
+      if (hasEma || hasHyst) {
+        val emaAlpha = if (hasEma) opts!!.getDouble("emaAlpha").toFloat() else 0.35f
+        val hysteresisFrames = if (hasHyst) opts!!.getInt("hysteresisFrames") else 3
+        nativeSetPostProcessorConfig(emaAlpha, hysteresisFrames)
+      }
 
-    promise.resolve(null)
+      if (opts?.hasKey("onsetDetection") == true) {
+        nativeSetOnsetDetection(opts.getBoolean("onsetDetection"))
+      }
+
+      if (opts?.hasKey("adaptiveFrameSize") == true) {
+        nativeSetAdaptiveFrameSize(opts.getBoolean("adaptiveFrameSize"))
+      }
+
+      promise.resolve(null)
+    } catch (e: Exception) {
+      promise.reject("CONFIGURE_ERROR", "configure failed: ${e.message}", e)
+    }
   }
 
   override fun start(promise: Promise) {
-    val started = nativeStart()
-    if (started) {
-      isRunning = true
-      promise.resolve(null)
-    } else {
-      promise.reject("START_ERROR", "Failed to start audio capture")
+    try {
+      val started = nativeStart()
+      if (started) {
+        isRunning = true
+        promise.resolve(null)
+      } else {
+        promise.reject("START_ERROR", "Failed to start audio capture")
+      }
+    } catch (e: Exception) {
+      promise.reject("START_ERROR", "start failed: ${e.message}", e)
     }
   }
 
@@ -75,7 +100,7 @@ class TunerEngineModule(reactContext: ReactApplicationContext) :
   }
 
   override fun setTemperament(name: String) {
-    // Temperament support added in M2
+    nativeSetTemperament(name)
   }
 
   override fun requestPermission(promise: Promise) {
@@ -117,6 +142,16 @@ class TunerEngineModule(reactContext: ReactApplicationContext) :
     val map = WritableNativeMap()
     map.putBoolean("isRunning", isRunning)
     map.putBoolean("engineReady", nativeIsRunning())
+    map.putDouble("seq", pitchSequence.toDouble())
+    map.putBoolean("hasPitch", latestHasPitch)
+    map.putDouble("frequency", latestFrequency.toDouble())
+    map.putDouble("confidence", latestConfidence.toDouble())
+    map.putDouble("rmsDb", latestRmsDb.toDouble())
+    map.putString("noteName", latestNoteName)
+    map.putInt("octave", latestOctave)
+    map.putDouble("cents", latestCents.toDouble())
+    map.putString("nearestString", latestNearestString)
+    map.putDouble("stringDeviation", latestStringDeviation.toDouble())
     return map
   }
 
@@ -137,21 +172,16 @@ class TunerEngineModule(reactContext: ReactApplicationContext) :
     nearestString: String,
     stringDeviation: Float
   ) {
-    val params = Arguments.createMap().apply {
-      putBoolean("hasPitch", hasPitch)
-      putDouble("frequency", frequency.toDouble())
-      putDouble("confidence", confidence.toDouble())
-      putDouble("rmsDb", rmsDb.toDouble())
-      putString("noteName", noteName)
-      putInt("octave", octave)
-      putDouble("cents", cents.toDouble())
-      putString("nearestString", nearestString)
-      putDouble("stringDeviation", stringDeviation.toDouble())
-    }
-
-    reactApplicationContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit("onPitch", params)
+    latestHasPitch = hasPitch
+    latestFrequency = frequency
+    latestConfidence = confidence
+    latestRmsDb = rmsDb
+    latestNoteName = noteName
+    latestOctave = octave
+    latestCents = cents
+    latestNearestString = nearestString
+    latestStringDeviation = stringDeviation
+    pitchSequence++
   }
 
   // JNI methods
@@ -170,6 +200,8 @@ class TunerEngineModule(reactContext: ReactApplicationContext) :
   private external fun nativeSetHpfCutoff(hz: Float)
   private external fun nativeSetPostProcessorConfig(emaAlpha: Float, hysteresisFrames: Int)
   private external fun nativeSetOnsetDetection(enabled: Boolean)
+  private external fun nativeSetTemperament(name: String)
+  private external fun nativeSetAdaptiveFrameSize(enabled: Boolean)
   private external fun nativeIsRunning(): Boolean
 
   companion object {

package/cpp/build/CMakeFiles/Makefile.cmake

@@ -10,86 +10,24 @@ set(CMAKE_MAKEFILE_DEPENDS
   "/Users/deniz.yesilirmak/Documents/personal/react-native-tuner-engine/cpp/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"
@@ -105,10 +43,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"
   )