react-native-simple-note-pitch-detector 0.1.8 → 0.2.0

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

@@ -6,25 +6,19 @@ import be.tarsos.dsp.io.android.AudioDispatcherFactory
 import be.tarsos.dsp.pitch.PitchDetectionHandler
 import be.tarsos.dsp.pitch.PitchProcessor
 import be.tarsos.dsp.pitch.PitchProcessor.PitchEstimationAlgorithm
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import kotlin.math.log2
 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 lateinit var onChangePitch: (String, Double) -> Unit
+    private var isRecording = false
 
     private var dispatcher: AudioDispatcher? = null
     private var processor: AudioProcessor? = null
-
     private var runner: Thread? = null
 
     private val handler = PitchDetectionHandler { res, e ->
@@ -40,23 +34,34 @@ class PitchAnalyzer {
     }
 
     private fun process(pitchInHz: Float) {
-        val index = round(12 * (log2(pitchInHz / 440) / log2(2f)) + 69) % 12
+        val freq = round(12 * (log2(pitchInHz / 440) / log2(2f)) + 69)
+        val octave = freq / 12
+        val index = freq % 12
 
         if (!index.isNaN() && pitchInHz > 0) {
-            val tone = tones[index.toInt()]
-            val frequency = pitchInHz.toDouble()
+            val note = notes[index.toInt()]
 
-            this.onChangePitch(tone, frequency)
+            this.onChangePitch("$note$octave", pitchInHz.toDouble())
         }
     }
 
+    fun addOnChangePitchListener(onChangePitch: (String, Double) -> Unit) {
+        this.onChangePitch = onChangePitch
+    }
+
     fun start() {
         prepare()
         runner = Thread(dispatcher)
         runner?.start()
+        isRecording = true
     }
     fun stop() {
         dispatcher?.stop()
         runner?.interrupt()
+        isRecording = false
+    }
+
+    fun isRecording(): Boolean {
+        return isRecording
     }
 }

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
@@ -10,36 +7,31 @@ import androidx.core.os.bundleOf
 
 class ReactNativeSimpleNotePitchDetectorModule : Module() {
 
+  private val pitchAnalyzer = PitchAnalyzer()
+
   override fun definition() = ModuleDefinition {
+
     Name("ReactNativeSimpleNotePitchDetector")
 
     Events("onChangePitch")
 
     Function("start") {
-
-      val pitchAnalyzer = PitchAnalyzer { tone: String, frequency: Double ->
+      pitchAnalyzer.addOnChangePitchListener { note: String, frequency: Double ->
         this@ReactNativeSimpleNotePitchDetectorModule.sendEvent(
           "onChangePitch",
-          bundleOf("tone" to tone, "frequency" to frequency)
+          bundleOf("note" to note, "frequency" to frequency)
         )
       }
 
       pitchAnalyzer.start()
+    }
+
+    Function("stop") {
+        pitchAnalyzer.stop()
+    }
 
-//      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()
-//      }
+    Function("isRecording") {
+      pitchAnalyzer.isRecording()
     }
   }
 }

package/build/ReactNativeSimpleNotePitchDetector.types.d.ts

@@ -1,5 +1,6 @@
 export type ChangeEventPayload = {
-    value: string;
+    note: string;
+    frequency: number;
 };
 export type ReactNativeSimpleNotePitchDetectorViewProps = {
     name: string;

package/build/ReactNativeSimpleNotePitchDetector.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.d.ts","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}
+{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.d.ts","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/build/ReactNativeSimpleNotePitchDetector.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.js","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ChangeEventPayload = {\n  value: string;\n};\n\nexport type ReactNativeSimpleNotePitchDetectorViewProps = {\n  name: string;\n};\n"]}
+{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.js","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ChangeEventPayload = {\n  note: string;\n  frequency: number;\n};\n\nexport type ReactNativeSimpleNotePitchDetectorViewProps = {\n  name: string;\n};\n"]}

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.2.0",
   "description": "a simple react native library to detect the pitch of the input recording",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ReactNativeSimpleNotePitchDetector.types.ts

@@ -1,5 +1,6 @@
 export type ChangeEventPayload = {
-  value: string;
+  note: string;
+  frequency: number;
 };
 
 export type ReactNativeSimpleNotePitchDetectorViewProps = {