react-native-simple-note-pitch-detector 0.1.7 → 0.1.9

package/android/src/main/java/expo/modules/simplenotepitchdetector/PitchAnalyzer.kt

@@ -14,19 +14,18 @@ import kotlin.math.round
 
 class PitchAnalyzer {
 
-    var onChangePitch: (String, Double) -> Unit
+    private val notes = arrayOf("C","C#","D","D#","E","F","F#","G","G#","A","A#","B")
 
-    constructor(callback: (String, Double) -> Unit) {
-        this.onChangePitch = callback
-    }
-
-    private val tones = arrayOf("C","C#","D","D#","E","F","F#","G","G#","A","A#","B")
+    private var onChangePitch: (String, Double) -> Unit
 
     private var dispatcher: AudioDispatcher? = null
     private var processor: AudioProcessor? = null
-
     private var runner: Thread? = null
 
+    constructor(callback: (String, Double) -> Unit) {
+        this.onChangePitch = callback
+    }
+
     private val handler = PitchDetectionHandler { res, e ->
         val pitchInHz = res.pitch
         process(pitchInHz)
@@ -40,13 +39,14 @@ class PitchAnalyzer {
     }
 
     private fun process(pitchInHz: Float) {
-        val index = round(12 * (log2(pitchInHz / 440) / log2(2f)) + 69) % 12
+        val octave = round(12 * (log2(pitchInHz / 440) / log2(2f)) + 69)
+        val index = octave % 12
 
         if (!index.isNaN() && pitchInHz > 0) {
-            val tone = tones[index.toInt()]
+            val note = notes[index.toInt()]
             val frequency = pitchInHz.toDouble()
 
-            this.onChangePitch(tone, frequency)
+            this.onChangePitch("$note$octave", frequency)
         }
     }
 

package/android/src/main/java/expo/modules/simplenotepitchdetector/ReactNativeSimpleNotePitchDetectorModule.kt

@@ -1,8 +1,5 @@
 package expo.modules.simplenotepitchdetector
 
-import android.Manifest
-import android.content.pm.PackageManager
-import androidx.core.app.ActivityCompat
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.simplepitchdetector.PitchAnalyzer
@@ -25,21 +22,6 @@ class ReactNativeSimpleNotePitchDetectorModule : Module() {
       }
 
       pitchAnalyzer.start()
-
-//      val context = appContext.reactContext!!
-//      var activity = appContext.currentActivity!!
-//      var permissionsGranted = ActivityCompat.checkSelfPermission(context, permissions[0]) == PackageManager.PERMISSION_GRANTED
-//      if (!permissionsGranted) {
-//        ActivityCompat.requestPermissions(activity, permissions, 200)
-//      } else {
-//        val pitchAnalyzer = PitchAnalyzer {
-//          this@ReactNativeSimpleNotePitchDetectorModule.sendEvent(
-//            "onChange",
-//            bundleOf("tone" to it)
-//          )
-//        }
-//        pitchAnalyzer.start()
-//      }
     }
   }
 }

package/ios/ReactNativeSimpleNotePitchDetector.podspec

@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
+  s.dependency 'Beethoven', '~> 5.0'
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

package/ios/ReactNativeSimpleNotePitchDetectorModule.swift

@@ -1,25 +1,45 @@
 import ExpoModulesCore
+import Beethoven
+import Pitchy
 
 public class ReactNativeSimpleNotePitchDetectorModule: Module {
+    
+    lazy var pitchEngine: PitchEngine = { [weak self] in
+        let config = Config(estimationStrategy: .yin)
+        let pitchEngine = PitchEngine(config: config, delegate: self)
+        return pitchEngine
+    }()
 
   public func definition() -> ModuleDefinition {
 
     Name("ReactNativeSimpleNotePitchDetector")
 
-    Events("onChange")
+    Events("onChangePitch")
 
-    Function("hello") {
-      return "Hello world! 👋"
+    Function("start") {
+        pitchEngine.start()
     }
+  }
+}
 
-    // Defines a JavaScript function that always returns a Promise and whose native code
-    // is by default dispatched on the different thread than the JavaScript runtime runs on.
-    AsyncFunction("setValueAsync") { (value: String) in
-      // Send an event to JavaScript.
-      self.sendEvent("onChange", [
-        "value": value
-      ])
-    }
+extension ReactNativeSimpleNotePitchDetectorModule: PitchEngineDelegate {
+  public func pitchEngine(_ pitchEngine: PitchEngine, didReceivePitch pitch: Pitch) {
+      
+      let offsetPercentage = pitch.closestOffset.percentage
+      let absOffsetPercentage = abs(offsetPercentage)
+
+      guard absOffsetPercentage > 1.0 else {
+        return
+      }
+
+      self.sendEvent("onChangePitch", ["note" :  pitch.note.string, "frequency" : pitch.frequency])
+  }
+
+  public func pitchEngine(_ pitchEngine: PitchEngine, didReceiveError error: Error) {
+    
+  }
 
+  public func pitchEngineWentBelowLevelThreshold(_ pitchEngine: PitchEngine) {
+    
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-simple-note-pitch-detector",
-  "version": "0.1.7",
-  "description": "asdf",
+  "version": "0.1.9",
+  "description": "a simple react native library to detect the pitch of the input recording",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {