react-native-audio-api 0.4.12-beta.1 → 0.4.12-beta.3

package/common/cpp/{libs → audioapi/libs}/dsp/spectral.h

@@ -1,12 +1,12 @@
-#include "./common.h"
+#include <audioapi/libs/dsp/common.h>
 
 #ifndef SIGNALSMITH_DSP_SPECTRAL_H
 #define SIGNALSMITH_DSP_SPECTRAL_H
 
-#include "./perf.h"
-#include "./fft.h"
-#include "./windows.h"
-#include "./delay.h"
+#include <audioapi/libs/dsp/perf.h>
+#include <audioapi/libs/dsp/fft.h>
+#include <audioapi/libs/dsp/windows.h>
+#include <audioapi/libs/dsp/delay.h>
 
 #include <cmath>
 
@@ -14,15 +14,15 @@ namespace signalsmith {
 namespace spectral {
 	/**	@defgroup Spectral Spectral Processing
 		@brief Tools for frequency-domain manipulation of audio signals
-		
+
 		@{
 		@file
 	*/
-	
+
 	/** @brief An FFT with built-in windowing and round-trip scaling
-	
+
 		This uses a Modified Real FFT, which applies half-bin shift before the transform.  The result therefore has `N/2` bins, centred at the frequencies: `(i + 0.5)/N`.
-		
+
 		This avoids the awkward (real-valued) bands for DC-offset and Nyquist.
 	 */
 	template<typename Sample>
@@ -66,7 +66,7 @@ namespace spectral {
 		template<class WindowFn>
 		void setSize(int size, WindowFn fn, Sample windowOffset=0.5, int rotateSamples=0) {
 			setSizeWindow(size, rotateSamples);
-		
+
 			Sample invSize = 1/(Sample)size;
 			for (int i = 0; i < size; ++i) {
 				Sample r = (i + windowOffset)*invSize;
@@ -88,7 +88,7 @@ namespace spectral {
 		int size() const {
 			return mrfft.size();
 		}
-		
+
 		/// Performs an FFT, with windowing and rotation (if enabled)
 		template<bool withWindow=true, bool withScaling=false, class Input, class Output>
 		void fft(Input &&input, Output &&output) {
@@ -130,17 +130,17 @@ namespace spectral {
 			mrfft.ifft(input, output);
 		}
 	};
-	
+
 	/** STFT synthesis, built on a `MultiBuffer`.
- 
+
 		Any window length and block interval is supported, but the FFT size may be rounded up to a faster size (by zero-padding).  It uses a heuristically-optimal Kaiser window modified for perfect-reconstruction.
-		
+
 		\diagram{stft-aliasing-simulated.svg,Simulated bad-case aliasing (random phase-shift for each band) for overlapping ratios}
 
 		There is a "latest valid index", and you can read the output up to one `historyLength` behind this (see `.resize()`).  You can read up to one window-length _ahead_ to get partially-summed future output.
-		
+
 		\diagram{stft-buffer-validity.svg}
-		
+
 		You move the valid index along using `.ensureValid()`, passing in a functor which provides spectra (using `.analyse()` and/or direct modification through `.spectrum[c]`):
 
 		\code
@@ -165,7 +165,7 @@ namespace spectral {
 				stft += blockSize;
 			}
 		\endcode
-		
+
 		The index passed to this functor will be greater than the previous valid index, and `<=` the index you pass in.  Therefore, if you call `.ensureValid()` every sample, it can only ever be `0`.
 	*/
 	template<typename Sample>
@@ -183,17 +183,17 @@ namespace spectral {
 		public:
 			MultiSpectrum() : MultiSpectrum(0, 0) {}
 			MultiSpectrum(int channels, int bands) : channels(channels), stride(bands), buffer(channels*bands, 0) {}
-			
+
 			void resize(int nChannels, int nBands) {
 				channels = nChannels;
 				stride = nBands;
 				buffer.assign(channels*stride, 0);
 			}
-			
+
 			void reset() {
 				buffer.assign(buffer.size(), 0);
 			}
-			
+
 			void swap(MultiSpectrum &other) {
 				using std::swap;
 				swap(buffer, other.buffer);
@@ -222,7 +222,7 @@ namespace spectral {
 			this->_fftSize = fftSize;
 			this->_interval = newInterval;
 			validUntilIndex = -1;
-			
+
 			setWindow(windowShape, rotate);
 
 			spectrum.resize(channels, fftSize/2);
@@ -235,7 +235,7 @@ namespace spectral {
 		// for convenience
 		static constexpr Window kaiser = Window::kaiser;
 		static constexpr Window acg = Window::acg;
-		
+
 		/** Swaps between the default (Kaiser) shape and Approximate Confined Gaussian (ACG).
 		\diagram{stft-windows.svg,Default (Kaiser) windows and partial cumulative sum}
 		The ACG has better rolloff since its edges go to 0:
@@ -251,25 +251,25 @@ namespace spectral {
 			if (windowShape == Window::kaiser) {
 				using Kaiser = ::signalsmith::windows::Kaiser;
 				/// Roughly optimal Kaiser for STFT analysis (forced to perfect reconstruction)
-				auto kaiser = Kaiser::withBandwidth(_windowSize/double(_interval), true);
-				kaiser.fill(window, _windowSize);
+				auto kaiser_ = Kaiser::withBandwidth(_windowSize/double(_interval), true);
+				kaiser_.fill(window, _windowSize);
 			} else {
 				using Confined = ::signalsmith::windows::ApproximateConfinedGaussian;
 				auto confined = Confined::withBandwidth(_windowSize/double(_interval));
 				confined.fill(window, _windowSize);
 			}
 			::signalsmith::windows::forcePerfectReconstruction(window, _windowSize, _interval);
-			
+
 			// TODO: fill extra bits of an input buffer with NaN/Infinity, to break this, and then fix by adding zero-padding to WindowedFFT (as opposed to zero-valued window sections)
 			for (int i = _windowSize; i < _fftSize; ++i) {
 				window[i] = 0;
 			}
 		}
-		
+
 		using Spectrum = MultiSpectrum;
 		Spectrum spectrum;
 		WindowedFFT<Sample> fft;
-		
+
 		STFT() {}
 		/// Parameters passed straight to `.resize()`
 		STFT(int channels, int windowSize, int interval, int historyLength=0, int zeroPadding=0) {
@@ -280,7 +280,7 @@ namespace spectral {
 		void resize(int nChannels, int windowSize, int interval, int historyLength=0, int zeroPadding=0) {
 			resizeInternal(nChannels, windowSize, interval, historyLength, zeroPadding);
 		}
-		
+
 		int windowSize() const {
 			return _windowSize;
 		}
@@ -307,18 +307,18 @@ namespace spectral {
 			}
 			return result;
 		}
-		
+
 		/// Resets everything - since we clear the output sum, it will take `windowSize` samples to get proper output.
 		void reset() {
 			Super::reset();
 			spectrum.reset();
 			validUntilIndex = -1;
 		}
-		
+
 		/** Generates valid output up to the specified index (or 0), using the callback as many times as needed.
-			
+
 			The callback should be a functor accepting a single integer argument, which is the index for which a spectrum is required.
-			
+
 			The block created from these spectra will start at this index in the output, plus `.latency()`.
 		*/
 		template<class AnalysisFn>
@@ -354,9 +354,9 @@ namespace spectral {
 		int nextInvalid() const {
 			return validUntilIndex + 1;
 		}
-		
+
 		/** Analyse a multi-channel input, for any type where `data[channel][index]` returns samples
- 
+
 		Results can be read/edited using `.spectrum`. */
 		template<class Data>
 		void analyse(Data &&data) {
@@ -385,12 +385,12 @@ namespace spectral {
 		}
 
 		/** Internal latency (between the block-index requested in `.ensureValid()` and its position in the output)
- 
+
 		Currently unused, but it's in here to allow for a future implementation which spreads the FFT calculations out across each interval.*/
 		int latency() {
 			return 0;
 		}
-		
+
 		// @name Shift the underlying buffer (moving the "valid" index accordingly)
 		// @{
 		STFT & operator ++() {
@@ -435,7 +435,7 @@ namespace spectral {
 		using Super = STFT<Sample>;
 	public:
 		signalsmith::delay::MultiBuffer<Sample> input;
-	
+
 		ProcessSTFT(int inChannels, int outChannels, int windowSize, int interval, int historyLength=0) {
 			resize(inChannels, outChannels, windowSize, interval, historyLength);
 		}
@@ -443,7 +443,7 @@ namespace spectral {
 		/** Alter the spectrum, using input up to this point, for the output block starting from this point.
 			Sub-classes should replace this with whatever processing is desired. */
 		virtual void processSpectrum(int /*blockIndex*/) {}
-		
+
 		/// Sets the input/output channels, FFT size and interval.
 		void resize(int inChannels, int outChannels, int windowSize, int interval, int historyLength=0) {
 			Super::resize(outChannels, windowSize, interval, historyLength);
@@ -458,7 +458,7 @@ namespace spectral {
 		int latency() {
 			return Super::latency() + (this->windowSize() - 1);
 		}
-		
+
 		void ensureValid(int i=0) {
 			Super::ensureValid(i, [&](int blockIndex) {
 				this->analyse(input.view(blockIndex - this->windowSize() + 1));

package/common/cpp/{libs → audioapi/libs}/dsp/windows.h

@@ -1,4 +1,4 @@
-#include "./common.h"
+#include <audioapi/libs/dsp/common.h>
 
 #ifndef SIGNALSMITH_DSP_WINDOWS_H
 #define SIGNALSMITH_DSP_WINDOWS_H
@@ -10,15 +10,15 @@ namespace signalsmith {
 namespace windows {
 	/**	@defgroup Windows Window functions
 		@brief Windows for spectral analysis
-		
+
 		These are generally double-precision, because they are mostly calculated during setup/reconfiguring, not real-time code.
-		
+
 		@{
 		@file
 	*/
-	
+
 	/** @brief The Kaiser window (almost) maximises the energy in the main-lobe compared to the side-lobes.
-		
+
 		Kaiser windows can be constructing using the shape-parameter (beta) or using the static `with???()` methods.*/
 	class Kaiser {
 		// I_0(x)=\sum_{k=0}^{N}\frac{x^{2k}}{(k!)^2\cdot4^k}
@@ -37,7 +37,7 @@ namespace windows {
 		}
 		double beta;
 		double invB0;
-		
+
 		static double heuristicBandwidth(double bandwidth) {
 			// Good peaks
 			//return bandwidth + 8/((bandwidth + 3)*(bandwidth + 3));
@@ -68,7 +68,7 @@ namespace windows {
 			double alpha = std::sqrt(bandwidth*bandwidth*0.25 - 1);
 			return alpha*M_PI;
 		}
-		
+
 		static double betaToBandwidth(double beta) {
 			double alpha = beta*(1.0/M_PI);
 			return 2*std::sqrt(alpha*alpha + 1);
@@ -150,7 +150,7 @@ namespace windows {
 			double arg = std::sqrt(1 - r*r);
 			return bessel0(beta*arg)*invB0;
 		}
-	
+
 		/// Fills an arbitrary container with a Kaiser window
 		template<typename Data>
 		void fill(Data &&data, int size) const {
@@ -164,11 +164,11 @@ namespace windows {
 	};
 
 	/** @brief The Approximate Confined Gaussian window is (almost) optimal
-		
+
 		ACG windows can be constructing using the shape-parameter (sigma) or using the static `with???()` methods.*/
 	class ApproximateConfinedGaussian {
 		double gaussianFactor;
-		
+
 		double gaussian(double x) const {
 			return std::exp(-x*x*gaussianFactor);
 		}
@@ -182,7 +182,7 @@ namespace windows {
 		}
 
 		ApproximateConfinedGaussian(double sigma) : gaussianFactor(0.0625/(sigma*sigma)) {}
-	
+
 		/// Fills an arbitrary container
 		template<typename Data>
 		void fill(Data &&data, int size) const {

package/common/cpp/{libs → audioapi/libs}/signalsmith-stretch.h

@@ -1,9 +1,9 @@
 #ifndef SIGNALSMITH_STRETCH_H
 #define SIGNALSMITH_STRETCH_H
 
-#include "dsp/spectral.h"
-#include "dsp/delay.h"
-#include "dsp/perf.h"
+#include <audioapi/libs/dsp/spectral.h>
+#include <audioapi/libs/dsp/delay.h>
+#include <audioapi/libs/dsp/perf.h>
 SIGNALSMITH_DSP_VERSION_CHECK(1, 6, 0); // Check version is compatible
 #include <vector>
 #include <algorithm>
@@ -31,7 +31,7 @@ struct SignalsmithStretch {
 	int outputLatency() const {
 		return stft.windowSize() - inputLatency();
 	}
-	
+
 	void reset() {
 		stft.reset();
 		inputBuffer.reset();
@@ -59,7 +59,7 @@ struct SignalsmithStretch {
 		inputBuffer.resize(channels, blockSamples + intervalSamples + 1);
 		timeBuffer.assign(stft.fftSize(), 0);
 		channelBands.assign(bands*channels, Band());
-		
+
 		peaks.reserve(bands/2);
 		energy.resize(bands);
 		smoothedEnergy.resize(bands);
@@ -129,7 +129,7 @@ struct SignalsmithStretch {
 						b.inputEnergy = 0;
 					}
 				}
-			
+
 				if (inputSamples > 0) {
 					// copy from the input, wrapping around if needed
 					for (int outputIndex = 0; outputIndex < outputSamples; ++outputIndex) {
@@ -191,10 +191,10 @@ struct SignalsmithStretch {
 					flushed = false; // TODO: first block after a flush should be gain-compensated
 
 					for (int c = 0; c < channels; ++c) {
-						auto channelBands = bandsForChannel(c);
+						auto channelBands_ = bandsForChannel(c);
 						auto &&spectrumBands = stft.spectrum[c];
 						for (int b = 0; b < bands; ++b) {
-							channelBands[b].input = spectrumBands[b];
+							channelBands_[b].input = spectrumBands[b];
 						}
 					}
 
@@ -214,24 +214,24 @@ struct SignalsmithStretch {
 							stft.analyse(c, timeBuffer);
 						}
 						for (int c = 0; c < channels; ++c) {
-							auto channelBands = bandsForChannel(c);
+							auto channelBands_ = bandsForChannel(c);
 							auto &&spectrumBands = stft.spectrum[c];
 							for (int b = 0; b < bands; ++b) {
-								channelBands[b].prevInput = spectrumBands[b];
+								channelBands_[b].prevInput = spectrumBands[b];
 							}
 						}
 					}
 				}
-				
+
 				Sample timeFactor = didSeek ? seekTimeFactor : stft.interval()/std::max<Sample>(1, inputInterval);
 				processSpectrum(newSpectrum, timeFactor);
 				didSeek = false;
 
 				for (int c = 0; c < channels; ++c) {
-					auto channelBands = bandsForChannel(c);
+					auto channelBands_ = bandsForChannel(c);
 					auto &&spectrumBands = stft.spectrum[c];
 					for (int b = 0; b < bands; ++b) {
-						spectrumBands[b] = channelBands[b].output;
+						spectrumBands[b] = channelBands_[b].output;
 					}
 				}
 			});
@@ -280,9 +280,9 @@ struct SignalsmithStretch {
 		stft += plainOutput + foldedBackOutput;
 		// Reset the phase-vocoder stuff, so the next block gets a fresh start
 		for (int c = 0; c < channels; ++c) {
-			auto channelBands = bandsForChannel(c);
+			auto channelBands_ = bandsForChannel(c);
 			for (int b = 0; b < bands; ++b) {
-				channelBands[b].prevInput = channelBands[b].output = 0;
+				channelBands_[b].prevInput = channelBands_[b].output = 0;
 			}
 		}
 		flushed = true;
@@ -311,7 +311,7 @@ private:
 	Sample freqToBand(Sample f) const {
 		return f*stft.fftSize() - Sample(0.5);
 	}
-	
+
 	struct Band {
 		Complex input, prevInput{0};
 		Complex output{0};
@@ -365,7 +365,7 @@ private:
 		Sample inputBin, freqGrad;
 	};
 	std::vector<PitchMapPoint> outputMap;
-	
+
 	struct Prediction {
 		Sample energy = 0;
 		Complex input;
@@ -390,7 +390,7 @@ private:
 		timeFactor = std::max<Sample>(timeFactor, 1/maxCleanStretch);
 		bool randomTimeFactor = (timeFactor > maxCleanStretch);
 		std::uniform_real_distribution<Sample> timeFactorDist(maxCleanStretch*2*randomTimeFactor - timeFactor, timeFactor);
-		
+
 		if (newSpectrum) {
 			for (int c = 0; c < channels; ++c) {
 				auto bins = bandsForChannel(c);
@@ -398,7 +398,7 @@ private:
 				Complex rot = std::polar(Sample(1), bandToFreq(0)*stft.interval()*Sample(2*M_PI));
 				Sample freqStep = bandToFreq(1) - bandToFreq(0);
 				Complex rotStep = std::polar(Sample(1), freqStep*stft.interval()*Sample(2*M_PI));
-				
+
 				for (int b = 0; b < bands; ++b) {
 					auto &bin = bins[b];
 					bin.output = signalsmith::perf::mul(bin.output, rot);
@@ -477,7 +477,7 @@ private:
 
 				auto &downBin = bins[b - 1];
 				phase += signalsmith::perf::mul(downBin.output, shortVerticalTwist);
-				
+
 				if (b >= longVerticalStep) {
 					Complex longDownInput = getFractional<&Band::input>(maxChannel, mapPoint.inputBin - longVerticalStep*binTimeFactor);
 					Complex longVerticalTwist = signalsmith::perf::mul<true>(prediction.input, longDownInput);
@@ -497,7 +497,7 @@ private:
 
 				auto &upBin = bins[b + 1];
 				phase += signalsmith::perf::mul<true>(upBin.output, shortVerticalTwist);
-				
+
 				if (b < bands - longVerticalStep) {
 					auto &longUpPrediction = predictions[b + longVerticalStep];
 					auto &longUpMapPoint = outputMap[b + longVerticalStep];
@@ -511,13 +511,13 @@ private:
 			}
 
 			outputBin.output = prediction.makeOutput(phase);
-			
+
 			// All other bins are locked in phase
 			for (int c = 0; c < channels; ++c) {
 				if (c != maxChannel) {
 					auto &channelBin = bandsForChannel(c)[b];
 					auto &channelPrediction = predictionsForChannel(c)[b];
-					
+
 					Complex channelTwist = signalsmith::perf::mul<true>(channelPrediction.input, prediction.input);
 					Complex channelPhase = signalsmith::perf::mul(outputBin.output, channelTwist);
 					channelBin.output = channelPrediction.makeOutput(channelPhase);
@@ -531,7 +531,7 @@ private:
 			}
 		}
 	}
-	
+
 	// Produces smoothed energy across all channels
 	void smoothEnergy(Sample smoothingBins) {
 		Sample smoothingSlew = 1/(1 + smoothingBins*Sample(0.5));
@@ -559,7 +559,7 @@ private:
 			}
 		}
 	}
-	
+
 	Sample mapFreq(Sample freq) const {
 		if (customFreqMap) return customFreqMap(freq);
 		if (freq > freqTonalityLimit) {
@@ -568,13 +568,13 @@ private:
 		}
 		return freq*freqMultiplier;
 	}
-	
+
 	// Identifies spectral peaks using energy across all channels
 	void findPeaks(Sample smoothingBins) {
 		smoothEnergy(smoothingBins);
 
 		peaks.resize(0);
-		
+
 		int start = 0;
 		while (start < bands) {
 			if (energy[start] > smoothedEnergy[start]) {
@@ -594,7 +594,7 @@ private:
 			++start;
 		}
 	}
-	
+
 	void updateOutputMap() {
 		if (peaks.empty()) {
 			for (int b = 0; b < bands; ++b) {
@@ -619,10 +619,10 @@ private:
 				Sample r = (b - prev.output)*rangeScale;
 				Sample h = r*r*(3 - 2*r);
 				Sample outB = b + outOffset + h*outScale;
-				
+
 				Sample gradH = 6*r*(1 - r);
 				Sample gradB = 1 + gradH*gradScale;
-				
+
 				outputMap[b] = {outB, gradB};
 			}
 		}

package/ios/{AudioAPIModule.mm → audioapi/ios/AudioAPIModule.mm}

@@ -1,34 +1,41 @@
 #import "AudioAPIModule.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridge+Private.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTCallInvoker.h>
 #import <ReactCommon/RCTTurboModule.h>
 #endif // RCT_NEW_ARCH_ENABLED
 
-#include "AudioAPIModuleInstaller.h"
+#include <audioapi/AudioAPIModuleInstaller.h>
 
-@implementation AudioAPIModule
+using namespace audioapi;
+using namespace facebook::react;
 
-#if defined(RCT_NEW_ARCH_ENABLED)
+@interface RCTBridge (JSIRuntime)
+- (void *)runtime;
+@end
+
+#if defined(RCT_NEW_ARCH_ENABLED) && REACT_NATIVE_MINOR_VERSION >= 75
 // nothing
-#else // defined(RCT_NEW_ARCH_ENABLED)
+#else // defined(RCT_NEW_ARCH_ENABLED) && REACT_NATIVE_MINOR_VERSION >= 75
 @interface RCTBridge (RCTTurboModule)
 - (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker;
 - (void)_tryAndHandleError:(dispatch_block_t)block;
 @end
 #endif // RCT_NEW_ARCH_ENABLED
 
+@implementation AudioAPIModule
+
 #if defined(RCT_NEW_ARCH_ENABLED)
 @synthesize callInvoker = _callInvoker;
 #endif // defined(RCT_NEW_ARCH_ENABLED)
 
-RCT_EXPORT_MODULE(AudioAPIModule)
+RCT_EXPORT_MODULE(AudioAPIModule);
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
-  auto *cxxBridge = reinterpret_cast<RCTCxxBridge *>(self.bridge);
-  auto jsiRuntime = reinterpret_cast<facebook::jsi::Runtime *>(cxxBridge.runtime);
+  auto jsiRuntime = reinterpret_cast<facebook::jsi::Runtime *>(self.bridge.runtime);
 
 #if defined(RCT_NEW_ARCH_ENABLED)
   auto jsCallInvoker = _callInvoker.callInvoker;

package/ios/{core → audioapi/ios/core}/AudioDecoder.mm

@@ -1,9 +1,9 @@
 #define MINIAUDIO_IMPLEMENTATION
-#import <miniaudio.h>
+#import <audioapi/libs/miniaudio.h>
 
-#include <AudioArray.h>
-#include <AudioBus.h>
-#include <AudioDecoder.h>
+#include <audioapi/core/utils/AudioArray.h>
+#include <audioapi/core/utils/AudioBus.h>
+#include <audioapi/core/utils/AudioDecoder.h>
 
 namespace audioapi {
 

package/ios/{core → audioapi/ios/core}/AudioPlayer.m

@@ -1,4 +1,4 @@
-#import <AudioPlayer.h>
+#import <audioapi/ios/core/AudioPlayer.h>
 
 @implementation AudioPlayer
 

package/ios/{core → audioapi/ios/core}/IOSAudioPlayer.mm

@@ -1,9 +1,9 @@
 #import <AVFoundation/AVFoundation.h>
 
-#include <AudioArray.h>
-#include <AudioBus.h>
-#include <Constants.h>
-#include <IOSAudioPlayer.h>
+#include <audioapi/core/Constants.h>
+#include <audioapi/core/utils/AudioArray.h>
+#include <audioapi/core/utils/AudioBus.h>
+#include <audioapi/ios/core/IOSAudioPlayer.h>
 
 namespace audioapi {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.4.12-beta.1",
+  "version": "0.4.12-beta.3",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -36,17 +36,17 @@
   "scripts": {
     "test": "jest",
     "typecheck": "tsc --noEmit",
-    "lint": "yarn lint:js && yarn lint:cpp & yarn lint:ios && yarn lint:kotlin",
+    "lint": "yarn lint:js && yarn lint:cpp && yarn lint:ios && yarn lint:kotlin",
     "lint:js": "eslint src && yarn prettier --check src",
     "lint:cpp": "./scripts/cpplint.sh",
     "lint:ios": "yarn format:ios --dry-run -Werror",
-    "lint:kotlin": "ktlint 'android/src/main/java/**'",
+    "lint:kotlin": "ktlint 'android/src/main/java/**/*.kt'",
     "format": "yarn format:js && yarn format:android:cpp && yarn format:android:kotlin && yarn format:ios && yarn format:common",
     "format:js": "prettier --write --list-different src",
-    "format:android:cpp": "find android/src/ -path android/src/cpp/libs -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
-    "format:android:kotlin": "ktlint -F 'android/src/main/java/**'",
+    "format:android:cpp": "find android/src/ -path android/src/main/cpp/audioapi/android/libs -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
+    "format:android:kotlin": "ktlint -F 'android/src/main/java/**/*.kt'",
     "format:ios": "find ios/ -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.mm\" -o -iname \"*.cpp\" | xargs clang-format -i",
-    "format:common": "find common/cpp/ -path 'common/cpp/libs' -prune -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
+    "format:common": "find common/cpp/ -path 'common/cpp/audioapi/libs' -prune -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
     "build": "bob build",
     "prepack": "cp ../../README.md ./README.md",
     "postpack": "rm ./README.md"

package/common/cpp/HostObjects/StretcherNodeHostObject.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "AudioNodeHostObject.h"
-#include "AudioParamHostObject.h"
-#include "StretcherNode.h"
-
-namespace audioapi {
-    using namespace facebook;
-
-    class StretcherNodeHostObject : public AudioNodeHostObject {
-    public:
-        explicit StretcherNodeHostObject(const std::shared_ptr<StretcherNode> &node)
-                : AudioNodeHostObject(node) {
-            addGetters(JSI_EXPORT_PROPERTY_GETTER(StretcherNodeHostObject, rate),
-                       JSI_EXPORT_PROPERTY_GETTER(StretcherNodeHostObject, semitones));
-        }
-
-        JSI_PROPERTY_GETTER(rate) {
-            auto stretcherNode = std::static_pointer_cast<StretcherNode>(node_);
-            auto rateParam =
-                    std::make_shared<AudioParamHostObject>(stretcherNode->getRateParam());
-            return jsi::Object::createFromHostObject(runtime, rateParam);
-        }
-
-        JSI_PROPERTY_GETTER(semitones) {
-            auto stretcherNode = std::static_pointer_cast<StretcherNode>(node_);
-            auto semitonesParam =
-                    std::make_shared<AudioParamHostObject>(stretcherNode->getSemitonesParam());
-            return jsi::Object::createFromHostObject(runtime, semitonesParam);
-        }
-    };
-} // namespace audioapi