react-native-simple-note-pitch-detector 0.2.8 → 0.3.0

package/build/index.d.ts

@@ -1,9 +1,8 @@
 import { Subscription } from "expo-modules-core";
-import ReactNativeSimpleNotePitchDetectorView from "./ReactNativeSimpleNotePitchDetectorView";
 import { ChangeEventPayload, ReactNativeSimpleNotePitchDetectorViewProps } from "./ReactNativeSimpleNotePitchDetector.types";
 export declare function start(): any;
 export declare function stop(): any;
 export declare function isRecording(): any;
 export declare function onChangePitch(listener: (event: ChangeEventPayload) => void): Subscription;
-export { ReactNativeSimpleNotePitchDetectorView, ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload, };
+export { ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload };
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACb,MAAM,mBAAmB,CAAC;AAG3B,OAAO,sCAAsC,MAAM,0CAA0C,CAAC;AAC9F,OAAO,EACL,kBAAkB,EAClB,2CAA2C,EAC5C,MAAM,4CAA4C,CAAC;AAEpD,wBAAgB,KAAK,QAEpB;AAED,wBAAgB,IAAI,QAEnB;AAED,wBAAgB,WAAW,QAE1B;AAOD,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,YAAY,CAEd;AAED,OAAO,EACL,sCAAsC,EACtC,2CAA2C,EAC3C,kBAAkB,GACnB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACb,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,kBAAkB,EAClB,2CAA2C,EAC5C,MAAM,4CAA4C,CAAC;AAEpD,wBAAgB,KAAK,QAEpB;AAED,wBAAgB,IAAI,QAEnB;AAED,wBAAgB,WAAW,QAE1B;AAOD,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,YAAY,CAEd;AAED,OAAO,EAAE,2CAA2C,EAAE,kBAAkB,EAAE,CAAC"}

package/build/index.js

@@ -1,6 +1,5 @@
 import { NativeModulesProxy, EventEmitter, } from "expo-modules-core";
 import ReactNativeSimpleNotePitchDetectorModule from "./ReactNativeSimpleNotePitchDetectorModule";
-import ReactNativeSimpleNotePitchDetectorView from "./ReactNativeSimpleNotePitchDetectorView";
 export function start() {
     return ReactNativeSimpleNotePitchDetectorModule.start();
 }
@@ -15,5 +14,4 @@ const emitter = new EventEmitter(ReactNativeSimpleNotePitchDetectorModule ??
 export function onChangePitch(listener) {
     return emitter.addListener("onChangePitch", listener);
 }
-export { ReactNativeSimpleNotePitchDetectorView, };
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,GAEb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAClG,OAAO,sCAAsC,MAAM,0CAA0C,CAAC;AAM9F,MAAM,UAAU,KAAK;IACnB,OAAO,wCAAwC,CAAC,KAAK,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,IAAI;IAClB,OAAO,wCAAwC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,OAAO,wCAAwC,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,YAAY,CAC9B,wCAAwC;IACtC,kBAAkB,CAAC,kCAAkC,CACxD,CAAC;AAEF,MAAM,UAAU,aAAa,CAC3B,QAA6C;IAE7C,OAAO,OAAO,CAAC,WAAW,CAAqB,eAAe,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC;AAED,OAAO,EACL,sCAAsC,GAGvC,CAAC","sourcesContent":["import {\n  NativeModulesProxy,\n  EventEmitter,\n  Subscription,\n} from \"expo-modules-core\";\n\nimport ReactNativeSimpleNotePitchDetectorModule from \"./ReactNativeSimpleNotePitchDetectorModule\";\nimport ReactNativeSimpleNotePitchDetectorView from \"./ReactNativeSimpleNotePitchDetectorView\";\nimport {\n  ChangeEventPayload,\n  ReactNativeSimpleNotePitchDetectorViewProps,\n} from \"./ReactNativeSimpleNotePitchDetector.types\";\n\nexport function start() {\n  return ReactNativeSimpleNotePitchDetectorModule.start();\n}\n\nexport function stop() {\n  return ReactNativeSimpleNotePitchDetectorModule.stop();\n}\n\nexport function isRecording() {\n  return ReactNativeSimpleNotePitchDetectorModule.isRecording();\n}\n\nconst emitter = new EventEmitter(\n  ReactNativeSimpleNotePitchDetectorModule ??\n    NativeModulesProxy.ReactNativeSimpleNotePitchDetector\n);\n\nexport function onChangePitch(\n  listener: (event: ChangeEventPayload) => void\n): Subscription {\n  return emitter.addListener<ChangeEventPayload>(\"onChangePitch\", listener);\n}\n\nexport {\n  ReactNativeSimpleNotePitchDetectorView,\n  ReactNativeSimpleNotePitchDetectorViewProps,\n  ChangeEventPayload,\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,GAEb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAMlG,MAAM,UAAU,KAAK;IACnB,OAAO,wCAAwC,CAAC,KAAK,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,IAAI;IAClB,OAAO,wCAAwC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,OAAO,wCAAwC,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,YAAY,CAC9B,wCAAwC;IACtC,kBAAkB,CAAC,kCAAkC,CACxD,CAAC;AAEF,MAAM,UAAU,aAAa,CAC3B,QAA6C;IAE7C,OAAO,OAAO,CAAC,WAAW,CAAqB,eAAe,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC","sourcesContent":["import {\n  NativeModulesProxy,\n  EventEmitter,\n  Subscription,\n} from \"expo-modules-core\";\n\nimport ReactNativeSimpleNotePitchDetectorModule from \"./ReactNativeSimpleNotePitchDetectorModule\";\nimport {\n  ChangeEventPayload,\n  ReactNativeSimpleNotePitchDetectorViewProps,\n} from \"./ReactNativeSimpleNotePitchDetector.types\";\n\nexport function start() {\n  return ReactNativeSimpleNotePitchDetectorModule.start();\n}\n\nexport function stop() {\n  return ReactNativeSimpleNotePitchDetectorModule.stop();\n}\n\nexport function isRecording() {\n  return ReactNativeSimpleNotePitchDetectorModule.isRecording();\n}\n\nconst emitter = new EventEmitter(\n  ReactNativeSimpleNotePitchDetectorModule ??\n    NativeModulesProxy.ReactNativeSimpleNotePitchDetector\n);\n\nexport function onChangePitch(\n  listener: (event: ChangeEventPayload) => void\n): Subscription {\n  return emitter.addListener<ChangeEventPayload>(\"onChangePitch\", listener);\n}\n\nexport { ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload };\n"]}

package/ios/ReactNativeSimpleNotePitchDetectorModule.swift

@@ -4,6 +4,10 @@ import Pitchy
 
 public class ReactNativeSimpleNotePitchDetectorModule: Module {
     
+    var bufferSize = 3
+    var notes = Array(repeating: "", count: 3)
+    var counter = 0
+    
     lazy var pitchEngine: PitchEngine = { [weak self] in
         let config = Config(estimationStrategy: .yin)
         let pitchEngine = PitchEngine(config: config, delegate: self)
@@ -11,6 +15,23 @@ public class ReactNativeSimpleNotePitchDetectorModule: Module {
         return pitchEngine
     }()
     
+    func mostFrequent(array: [String]) -> String? {
+        var counts = [String: Int]()
+
+        // Count the values with using forEach
+        array.forEach { counts[$0] = (counts[$0] ?? 0) + 1 }
+
+        // Find the most frequent value and its count with max(by:)
+        if let (value, count) = counts.max(by: {$0.1 < $1.1}) {
+            if (count <= 1) {
+                return nil
+            }
+            return value
+        }
+
+        return nil
+    }
+    
     var isRecording = false
 
     public func definition() -> ModuleDefinition {
@@ -45,8 +66,24 @@ extension ReactNativeSimpleNotePitchDetectorModule: PitchEngineDelegate {
         guard absOffsetPercentage > 1.0 else {
             return
         }
+        
+        if (counter == bufferSize) {
+            var result = mostFrequent(array: notes)
+            if (result != nil) {
+                self.sendEvent("onChangePitch", ["note" :  result, "soundPressure" : ""])
+            }
+            counter = 0
+        }
+        
+        do {
+            let note = try Note(frequency: pitch.wave.frequency)
+            notes[counter] = note.string
+            counter += 1
+        } catch {
+            
+        }
 
-        self.sendEvent("onChangePitch", ["note" :  pitch.note.string, "soundPressure" : pitchEngine.signalLevel])
+//        self.sendEvent("onChangePitch", ["note" :  pitch.note.string, "soundPressure" : pitchEngine.signalLevel])
     }
 
     public func pitchEngine(_ pitchEngine: PitchEngine, didReceiveError error: Error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-simple-note-pitch-detector",
-  "version": "0.2.8",
+  "version": "0.3.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/index.ts

@@ -5,7 +5,6 @@ import {
 } from "expo-modules-core";
 
 import ReactNativeSimpleNotePitchDetectorModule from "./ReactNativeSimpleNotePitchDetectorModule";
-import ReactNativeSimpleNotePitchDetectorView from "./ReactNativeSimpleNotePitchDetectorView";
 import {
   ChangeEventPayload,
   ReactNativeSimpleNotePitchDetectorViewProps,
@@ -34,8 +33,4 @@ export function onChangePitch(
   return emitter.addListener<ChangeEventPayload>("onChangePitch", listener);
 }
 
-export {
-  ReactNativeSimpleNotePitchDetectorView,
-  ReactNativeSimpleNotePitchDetectorViewProps,
-  ChangeEventPayload,
-};
+export { ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload };