react-native-simple-note-pitch-detector 0.1.8 → 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/ReactNativeSimpleNotePitchDetectorModule.swift

@@ -32,7 +32,7 @@ extension ReactNativeSimpleNotePitchDetectorModule: PitchEngineDelegate {
         return
       }
 
-      self.sendEvent("onChangePitch", ["note" :  pitch.note.string, "frequency" : pitch.frequency, "wave" : pitch.wave.wavelength])
+      self.sendEvent("onChangePitch", ["note" :  pitch.note.string, "frequency" : pitch.frequency])
   }
 
   public func pitchEngine(_ pitchEngine: PitchEngine, didReceiveError error: Error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-simple-note-pitch-detector",
-  "version": "0.1.8",
+  "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",