react-native-audio-api 0.6.0-rc.4 → 0.6.0

package/ios/audioapi/ios/core/IOSAudioRecorder.mm

@@ -2,73 +2,34 @@
 
 #include <audioapi/core/Constants.h>
 #include <audioapi/dsp/VectorMath.h>
+#include <audioapi/events/AudioEventHandlerRegistry.h>
 #include <audioapi/ios/core/IOSAudioRecorder.h>
 #include <audioapi/utils/AudioArray.h>
 #include <audioapi/utils/AudioBus.h>
+#include <audioapi/utils/CircularAudioArray.h>
+#include <unordered_map>
 
 namespace audioapi {
 
 IOSAudioRecorder::IOSAudioRecorder(
     float sampleRate,
     int bufferLength,
-    const std::function<void(void)> &onError,
-    const std::function<void(void)> &onStatusChange,
-    const std::function<void(std::shared_ptr<AudioBus>, int, double)> &onAudioReady)
-    : AudioRecorder(sampleRate, bufferLength, onError, onStatusChange, onAudioReady)
+    const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
+    : AudioRecorder(sampleRate, bufferLength, audioEventHandlerRegistry)
 {
-  circularBuffer_ = std::make_shared<AudioBus>(std::max(2 * bufferLength, 2048), 1, sampleRate);
-
   AudioReceiverBlock audioReceiverBlock = ^(const AudioBufferList *inputBuffer, int numFrames, AVAudioTime *when) {
     if (isRunning_.load()) {
-      // copying to circularBuffer_
-      auto *circularBufferChannel = circularBuffer_->getChannel(0)->getData();
-      auto *inputChannel = (float *)inputBuffer->mBuffers[0].mData;
-
-      auto framesToProcess = numFrames;
-      auto framesToCopy = 0;
-
-      if (writeIdx_ + numFrames > circularBuffer_->getSize()) {
-        framesToCopy = circularBuffer_->getSize() - writeIdx_;
-        memcpy(circularBufferChannel + writeIdx_, inputChannel, framesToCopy * sizeof(float));
-        framesToProcess -= framesToCopy;
-        writeIdx_ = 0;
-      }
-
-      memcpy(circularBufferChannel + writeIdx_, inputChannel + framesToCopy, framesToProcess * sizeof(float));
-
-      writeIdx_ += framesToProcess;
-      if (writeIdx_ >= circularBuffer_->getSize()) {
-        writeIdx_ = 0;
-      }
-
-      // copying to output bus and invoking callback
-      auto availableFrames =
-          writeIdx_ >= readIdx_ ? writeIdx_ - readIdx_ : circularBuffer_->getSize() - (readIdx_ - writeIdx_);
-
-      while (availableFrames >= bufferLength_) {
-        auto bus = std::make_shared<AudioBus>(bufferLength_, 1, sampleRate_);
-        auto *outputChannel = bus->getChannel(0)->getData();
-
-        framesToProcess = bufferLength_;
-        framesToCopy = 0;
-        if (readIdx_ + bufferLength_ > circularBuffer_->getSize()) {
-          framesToCopy = circularBuffer_->getSize() - readIdx_;
-          memcpy(outputChannel, circularBufferChannel + readIdx_, framesToCopy * sizeof(float));
-          framesToProcess -= framesToCopy;
-          readIdx_ = 0;
-        }
-
-        memcpy(outputChannel + framesToCopy, circularBufferChannel + readIdx_, framesToProcess * sizeof(float));
+      auto *inputChannel = static_cast<float *>(inputBuffer->mBuffers[0].mData);
+      circularBuffer_->push_back(inputChannel, numFrames);
+    }
 
-        readIdx_ += framesToProcess;
-        if (readIdx_ >= circularBuffer_->getSize()) {
-          readIdx_ = 0;
-        }
+    while (circularBuffer_->getNumberOfAvailableFrames() >= bufferLength_) {
+      auto bus = std::make_shared<AudioBus>(bufferLength_, 1, sampleRate_);
+      auto *outputChannel = bus->getChannel(0)->getData();
 
-        onAudioReady_(bus, bufferLength_, [when sampleTime] / [when sampleRate]);
+      circularBuffer_->pop_front(outputChannel, bufferLength_);
 
-        availableFrames -= bufferLength_;
-      }
+      invokeOnAudioReadyCallback(bus, bufferLength_, [when sampleTime] / [when sampleRate]);
     }
   };
 
@@ -103,6 +64,8 @@ void IOSAudioRecorder::stop()
 
   isRunning_.store(false);
   [audioRecorder_ stop];
+
+  sendRemainingData();
 }
 
 } // namespace audioapi

package/ios/audioapi/ios/core/NativeAudioPlayer.m

@@ -37,6 +37,7 @@
   NSLog(@"[AudioPlayer] start");
 
   AudioEngine *audioEngine = [AudioEngine sharedInstance];
+  assert(audioEngine != nil);
   self.sourceNodeId = [audioEngine attachSourceNode:self.sourceNode format:self.format];
 }
 
@@ -45,6 +46,7 @@
   NSLog(@"[AudioPlayer] stop");
 
   AudioEngine *audioEngine = [AudioEngine sharedInstance];
+  assert(audioEngine != nil);
   [audioEngine detachSourceNodeWithId:self.sourceNodeId];
   self.sourceNodeId = nil;
 }

package/ios/audioapi/ios/core/NativeAudioRecorder.m

@@ -14,7 +14,7 @@
 
     self.receiverBlock = [receiverBlock copy];
 
-    float devicePrefferedSampleRate = [[[AudioSessionManager sharedInstance] getDevicePreferredSampleRate] floatValue];
+    float devicePrefferedSampleRate = [[AVAudioSession sharedInstance] sampleRate];
 
     self.inputFormat = [[AVAudioFormat alloc] initWithCommonFormat:AVAudioPCMFormatFloat32
                                                         sampleRate:devicePrefferedSampleRate
@@ -91,12 +91,16 @@
 
 - (void)start
 {
-  [[AudioEngine sharedInstance] attachInputNode:self.sinkNode];
+  AudioEngine *audioEngine = [AudioEngine sharedInstance];
+  assert(audioEngine != nil);
+  [audioEngine attachInputNode:self.sinkNode];
 }
 
 - (void)stop
 {
-  [[AudioEngine sharedInstance] detachInputNode];
+  AudioEngine *audioEngine = [AudioEngine sharedInstance];
+  assert(audioEngine != nil);
+  [audioEngine detachInputNode];
 }
 
 - (void)cleanup

package/ios/audioapi/ios/events/IOSAudioEventHandlerRegistry.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#import <Foundation/Foundation.h>
+
+@interface IOSAudioEventHandlerRegistry : NSObject
+
+-

package/ios/audioapi/ios/events/IOSAudioEventHandlerRegistry.mm

@@ -0,0 +1,12 @@
+// #import <audioapi/ios/events/IOSAudioEventHandlerRegistry.h>
+//
+// #include <memory>
+// #include
+//
+//@implementation IOSAudioEventHandlerRegistry {
+//   std::shared_ptr<AudioEventHandlerRegistry> _eventHandler;
+//
+//
+// }
+//
+//@end

package/ios/audioapi/ios/system/AudioEngine.h

@@ -3,12 +3,17 @@
 #import <AVFoundation/AVFoundation.h>
 #import <Foundation/Foundation.h>
 
+@class AudioSessionManager;
+
 @interface AudioEngine : NSObject
 
 @property (nonatomic, strong) AVAudioEngine *audioEngine;
 @property (nonatomic, strong) NSMutableDictionary *sourceNodes;
 @property (nonatomic, strong) NSMutableDictionary *sourceFormats;
 @property (nonatomic, strong) AVAudioSinkNode *inputNode;
+@property (nonatomic, weak) AudioSessionManager *sessionManager;
+
+- (instancetype)initWithAudioSessionManager:(AudioSessionManager *)sessionManager;
 
 + (instancetype)sharedInstance;
 - (void)cleanup;

package/ios/audioapi/ios/system/AudioEngine.mm

@@ -7,22 +7,10 @@ static AudioEngine *_sharedInstance = nil;
 
 + (instancetype)sharedInstance
 {
-  static dispatch_once_t onceToken;
-
-  dispatch_once(&onceToken, ^{
-    _sharedInstance = [[self alloc] initPrivate];
-  });
-
   return _sharedInstance;
 }
 
-- (instancetype)init
-{
-  @throw [NSException exceptionWithName:@"Singleton" reason:@"Use +[AudioEngine sharedInstance]" userInfo:nil];
-  return nil;
-}
-
-- (instancetype)initPrivate
+- (instancetype)initWithAudioSessionManager:(AudioSessionManager *)sessionManager
 {
   if (self = [super init]) {
     self.audioEngine = [[AVAudioEngine alloc] init];
@@ -31,9 +19,12 @@ static AudioEngine *_sharedInstance = nil;
     self.sourceNodes = [[NSMutableDictionary alloc] init];
     self.sourceFormats = [[NSMutableDictionary alloc] init];
 
-    [[AudioSessionManager sharedInstance] setActive:true];
+    self.sessionManager = sessionManager;
+    [self.sessionManager setActive:true];
   }
 
+  _sharedInstance = self;
+
   return self;
 }
 
@@ -49,7 +40,8 @@ static AudioEngine *_sharedInstance = nil;
   self.sourceFormats = nil;
   self.inputNode = nil;
 
-  [[AudioSessionManager sharedInstance] setActive:false];
+  [self.sessionManager setActive:false];
+  self.sessionManager = nil;
 }
 
 - (bool)rebuildAudioEngine

package/ios/audioapi/ios/system/AudioSessionManager.h

@@ -13,12 +13,14 @@
 @property (nonatomic, assign) AVAudioSessionCategory sessionCategory;
 @property (nonatomic, assign) AVAudioSessionCategoryOptions sessionOptions;
 
-+ (instancetype)sharedInstance;
+- (instancetype)init;
 - (void)cleanup;
 - (bool)configureAudioSession;
 
 - (NSNumber *)getDevicePreferredSampleRate;
 - (void)setAudioSessionOptions:(NSString *)category mode:(NSString *)mode options:(NSArray *)options;
 - (bool)setActive:(bool)active;
+- (NSString *)requestRecordingPermissions;
+- (NSString *)checkRecordingPermissions;
 
 @end

package/ios/audioapi/ios/system/AudioSessionManager.mm

@@ -2,24 +2,7 @@
 
 @implementation AudioSessionManager
 
-static AudioSessionManager *_sharedInstance = nil;
-
-+ (instancetype)sharedInstance
-{
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    _sharedInstance = [[self alloc] initPrivate];
-  });
-  return _sharedInstance;
-}
-
 - (instancetype)init
-{
-  @throw [NSException exceptionWithName:@"Singleton" reason:@"Use +[AudioSessionManager sharedInstance]" userInfo:nil];
-  return nil;
-}
-
-- (instancetype)initPrivate
 {
   if (self = [super init]) {
     self.audioSession = [AVAudioSession sharedInstance];
@@ -192,4 +175,40 @@ static AudioSessionManager *_sharedInstance = nil;
   return true;
 }
 
+- (NSString *)requestRecordingPermissions
+{
+  [self.audioSession requestRecordPermission:^(BOOL granted){
+  }];
+  return [self checkRecordingPermissions];
+}
+
+- (NSString *)checkRecordingPermissions
+{
+  if (@available(iOS 17, *)) {
+    NSInteger res = [[AVAudioApplication sharedInstance] recordPermission];
+    switch (res) {
+      case AVAudioApplicationRecordPermissionUndetermined:
+        return @"Undetermined";
+      case AVAudioApplicationRecordPermissionGranted:
+        return @"Granted";
+      case AVAudioApplicationRecordPermissionDenied:
+        return @"Denied";
+      default:
+        return @"Undetermined";
+    }
+  } else {
+    NSInteger res = [self.audioSession recordPermission];
+    switch (res) {
+      case AVAudioSessionRecordPermissionUndetermined:
+        return @"Undetermined";
+      case AVAudioSessionRecordPermissionGranted:
+        return @"Granted";
+      case AVAudioSessionRecordPermissionDenied:
+        return @"Denied";
+      default:
+        return @"Undetermined";
+    }
+  }
+}
+
 @end

package/ios/audioapi/ios/system/LockScreenManager.h

@@ -4,16 +4,16 @@
 #import <Foundation/Foundation.h>
 #import <MediaPlayer/MediaPlayer.h>
 
-@class AudioManagerModule;
+@class AudioAPIModule;
 
 @interface LockScreenManager : NSObject
 
-@property (nonatomic, weak) AudioManagerModule *audioManagerModule;
+@property (nonatomic, weak) AudioAPIModule *audioAPIModule;
 
 @property (nonatomic, weak) MPNowPlayingInfoCenter *playingInfoCenter;
 @property (nonatomic, copy) NSString *artworkUrl;
 
-+ (instancetype)sharedInstanceWithAudioManagerModule:(AudioManagerModule *)audioManagerModule;
+- (instancetype)initWithAudioAPIModule:(AudioAPIModule *)audioAPIModule;
 - (void)cleanup;
 
 - (void)setLockScreenInfo:(NSDictionary *)info;

package/ios/audioapi/ios/system/LockScreenManager.mm

@@ -1,5 +1,5 @@
 #import <MediaPlayer/MediaPlayer.h>
-#import <audioapi/ios/AudioManagerModule.h>
+#import <audioapi/ios/AudioAPIModule.h>
 #import <audioapi/ios/system/LockScreenManager.h>
 
 #define LOCK_SCREEN_INFO                                          \
@@ -14,30 +14,14 @@
 
 @implementation LockScreenManager
 
-static LockScreenManager *_sharedInstance = nil;
-
-+ (instancetype)sharedInstanceWithAudioManagerModule:(AudioManagerModule *)audioManagerModule
-{
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    _sharedInstance = [[self alloc] initPrivateWithAudioManagerModule:audioManagerModule];
-  });
-  return _sharedInstance;
-}
-
-- (instancetype)init
-{
-  @throw [NSException exceptionWithName:@"Singleton" reason:@"Use +[LockScreenManager sharedInstance]" userInfo:nil];
-  return nil;
-}
-
-- (instancetype)initPrivateWithAudioManagerModule:(AudioManagerModule *)audioManagerModule
+- (instancetype)initWithAudioAPIModule:(AudioAPIModule *)audioAPIModule
 {
   if (self = [super init]) {
-    self.audioManagerModule = audioManagerModule;
+    self.audioAPIModule = audioAPIModule;
     self.playingInfoCenter = [MPNowPlayingInfoCenter defaultCenter];
     [[UIApplication sharedApplication] beginReceivingRemoteControlEvents];
   }
+
   return self;
 }
 
@@ -176,31 +160,31 @@ static LockScreenManager *_sharedInstance = nil;
 {
   MPRemoteCommandCenter *remoteCenter = [MPRemoteCommandCenter sharedCommandCenter];
 
-  if ([name isEqual:@"play"]) {
+  if ([name isEqual:@"remotePlay"]) {
     [self enableCommand:remoteCenter.playCommand withSelector:@selector(onPlay:) enabled:enabled];
-  } else if ([name isEqual:@"pause"]) {
+  } else if ([name isEqual:@"remotePause"]) {
     [self enableCommand:remoteCenter.pauseCommand withSelector:@selector(onPause:) enabled:enabled];
-  } else if ([name isEqual:@"stop"]) {
+  } else if ([name isEqual:@"remoteStop"]) {
     [self enableCommand:remoteCenter.stopCommand withSelector:@selector(onStop:) enabled:enabled];
-  } else if ([name isEqual:@"togglePlayPause"]) {
+  } else if ([name isEqual:@"remoteTogglePlayPause"]) {
     [self enableCommand:remoteCenter.togglePlayPauseCommand withSelector:@selector(onTogglePlayPause:) enabled:enabled];
-  } else if ([name isEqual:@"changePlaybackRate"]) {
+  } else if ([name isEqual:@"remoteChangePlaybackRate"]) {
     [self enableCommand:remoteCenter.changePlaybackRateCommand
            withSelector:@selector(onChangePlaybackRate:)
                 enabled:enabled];
-  } else if ([name isEqual:@"nextTrack"]) {
+  } else if ([name isEqual:@"remoteNextTrack"]) {
     [self enableCommand:remoteCenter.nextTrackCommand withSelector:@selector(onNextTrack:) enabled:enabled];
-  } else if ([name isEqual:@"previousTrack"]) {
+  } else if ([name isEqual:@"remotePreviousTrack"]) {
     [self enableCommand:remoteCenter.previousTrackCommand withSelector:@selector(onPreviousTrack:) enabled:enabled];
-  } else if ([name isEqual:@"skipForward"]) {
+  } else if ([name isEqual:@"remoteSkipForward"]) {
     [self enableCommand:remoteCenter.skipForwardCommand withSelector:@selector(onSkipForward:) enabled:enabled];
-  } else if ([name isEqual:@"skipBackward"]) {
+  } else if ([name isEqual:@"remoteSkipBackward"]) {
     [self enableCommand:remoteCenter.skipBackwardCommand withSelector:@selector(onSkipBackward:) enabled:enabled];
-  } else if ([name isEqual:@"seekForward"]) {
+  } else if ([name isEqual:@"remoteSeekForward"]) {
     [self enableCommand:remoteCenter.seekForwardCommand withSelector:@selector(onSeekForward:) enabled:enabled];
-  } else if ([name isEqual:@"seekBackward"]) {
+  } else if ([name isEqual:@"remoteSeekBackward"]) {
     [self enableCommand:remoteCenter.seekBackwardCommand withSelector:@selector(onSeekBackward:) enabled:enabled];
-  } else if ([name isEqual:@"changePlaybackPosition"]) {
+  } else if ([name isEqual:@"remoteChangePlaybackPosition"]) {
     [self enableCommand:remoteCenter.changePlaybackPositionCommand
            withSelector:@selector(onChangePlaybackPosition:)
                 enabled:enabled];
@@ -218,77 +202,81 @@ static LockScreenManager *_sharedInstance = nil;
 
 - (MPRemoteCommandHandlerStatus)onPlay:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemotePlay" body:@{}];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remotePlay" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onPause:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemotePause" body:@{}];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remotePause" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onStop:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteStop" body:@{}];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteStop" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onTogglePlayPause:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteTogglePlayPause" body:@{}];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteTogglePlayPause" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onChangePlaybackRate:(MPChangePlaybackRateCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteChangePlaybackRate"
-                                        body:@{@"value" : [NSNumber numberWithDouble:event.playbackRate]}];
+  NSDictionary *body = @{@"value" : [NSNumber numberWithDouble:event.playbackRate]};
+
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteChangePlaybackRate" eventBody:body];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onNextTrack:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteNextTrack" body:@{}];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteNextTrack" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onPreviousTrack:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemotePreviousTrack" body:@{}];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remotePreviousTrack" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onSeekForward:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteSeekForward" body:nil];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteSeekForward" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onSeekBackward:(MPRemoteCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteSeekBackward" body:@{}];
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteSeekBackward" eventBody:nil];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onSkipForward:(MPSkipIntervalCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteSkipForward"
-                                        body:@{@"value" : [NSNumber numberWithDouble:event.interval]}];
+  NSDictionary *body = @{@"value" : [NSNumber numberWithDouble:event.interval]};
+
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteSkipForward" eventBody:body];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onSkipBackward:(MPSkipIntervalCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteSkipBackward"
-                                        body:@{@"value" : [NSNumber numberWithDouble:event.interval]}];
+  NSDictionary *body = @{@"value" : [NSNumber numberWithDouble:event.interval]};
+
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteSkipBackward" eventBody:body];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 
 - (MPRemoteCommandHandlerStatus)onChangePlaybackPosition:(MPChangePlaybackPositionCommandEvent *)event
 {
-  [self.audioManagerModule sendEventWithName:@"onRemoteChangePlaybackPosition"
-                                        body:@{@"value" : [NSNumber numberWithDouble:event.positionTime]}];
+  NSDictionary *body = @{@"value" : [NSNumber numberWithDouble:event.positionTime]};
+
+  [self.audioAPIModule invokeHandlerWithEventName:@"remoteChangePlaybackPosition" eventBody:body];
   return MPRemoteCommandHandlerStatusSuccess;
 }
 

package/ios/audioapi/ios/system/NotificationManager.h

@@ -3,11 +3,11 @@
 #import <AVFoundation/AVFoundation.h>
 #import <Foundation/Foundation.h>
 
-@class AudioManagerModule;
+@class AudioAPIModule;
 
 @interface NotificationManager : NSObject
 
-@property (nonatomic, weak) AudioManagerModule *audioManagerModule;
+@property (nonatomic, weak) AudioAPIModule *audioAPIModule;
 @property (nonatomic, weak) NSNotificationCenter *notificationCenter;
 
 @property (nonatomic, assign) bool isInterrupted;
@@ -15,7 +15,7 @@
 @property (nonatomic, assign) bool audioInterruptionsObserved;
 @property (nonatomic, assign) bool volumeChangesObserved;
 
-+ (instancetype)sharedInstanceWithAudioManagerModule:(AudioManagerModule *)audioManagerModule;
+- (instancetype)initWithAudioAPIModule:(AudioAPIModule *)audioAPIModule;
 - (void)cleanup;
 
 - (void)observeAudioInterruptions:(BOOL)enabled;

package/ios/audioapi/ios/system/NotificationManager.mm

@@ -1,32 +1,16 @@
-#import <audioapi/ios/AudioManagerModule.h>
+#import <audioapi/ios/AudioAPIModule.h>
 #import <audioapi/ios/system/AudioEngine.h>
 #import <audioapi/ios/system/AudioSessionManager.h>
 #import <audioapi/ios/system/NotificationManager.h>
 
 @implementation NotificationManager
 
-static NotificationManager *_sharedInstance = nil;
 static NSString *VolumeObservationContext = @"VolumeObservationContext";
 
-+ (instancetype)sharedInstanceWithAudioManagerModule:(AudioManagerModule *)audioManagerModule
-{
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    _sharedInstance = [[self alloc] initPrivateWithAudioManagerModule:audioManagerModule];
-  });
-  return _sharedInstance;
-}
-
-- (instancetype)init
-{
-  @throw [NSException exceptionWithName:@"Singleton" reason:@"Use +[NotificationManager sharedInstance]" userInfo:nil];
-  return nil;
-}
-
-- (instancetype)initPrivateWithAudioManagerModule:(AudioManagerModule *)audioManagerModule
+- (instancetype)initWithAudioAPIModule:(AudioAPIModule *)audioAPIModule
 {
   if (self = [super init]) {
-    self.audioManagerModule = audioManagerModule;
+    self.audioAPIModule = audioAPIModule;
     self.notificationCenter = [NSNotificationCenter defaultCenter];
     self.audioInterruptionsObserved = false;
 
@@ -84,8 +68,9 @@ static NSString *VolumeObservationContext = @"VolumeObservationContext";
                        context:(void *)context
 {
   if ([keyPath isEqualToString:@"outputVolume"] && context == &VolumeObservationContext) {
-    NSNumber *volume = [NSNumber numberWithFloat:[change[@"new"] floatValue]];
-    [self.audioManagerModule sendEventWithName:@"onVolumeChange" body:@{@"value" : volume}];
+    NSDictionary *body = @{@"value" : [NSNumber numberWithFloat:[change[@"new"] floatValue]]};
+
+    [self.audioAPIModule invokeHandlerWithEventName:@"volumeChange" eventBody:body];
   }
 }
 
@@ -115,17 +100,22 @@ static NSString *VolumeObservationContext = @"VolumeObservationContext";
   NSInteger interruptionOption = [notification.userInfo[AVAudioSessionInterruptionOptionKey] integerValue];
 
   if (interruptionType == AVAudioSessionInterruptionTypeBegan) {
-    [self.audioManagerModule sendEventWithName:@"onInterruption"
-                                          body:@{@"type" : @"began", @"shouldResume" : @"false"}];
+    NSDictionary *body = @{@"type" : @"began", @"shouldResume" : @false};
+
+    [self.audioAPIModule invokeHandlerWithEventName:@"interruption" eventBody:body];
     return;
   }
 
   if (interruptionOption == AVAudioSessionInterruptionOptionShouldResume) {
-    [self.audioManagerModule sendEventWithName:@"onInterruption" body:@{@"type" : @"ended", @"shouldResume" : @"true"}];
+    NSDictionary *body = @{@"type" : @"ended", @"shouldResume" : @true};
+
+    [self.audioAPIModule invokeHandlerWithEventName:@"interruption" eventBody:body];
     return;
   }
 
-  [self.audioManagerModule sendEventWithName:@"onInterruption" body:@{@"type" : @"ended", @"shouldResume" : @"false"}];
+  NSDictionary *body = @{@"type" : @"ended", @"shouldResume" : @false};
+
+  [self.audioAPIModule invokeHandlerWithEventName:@"interruption" eventBody:body];
 }
 
 - (void)handleRouteChange:(NSNotification *)notification
@@ -163,14 +153,16 @@ static NSString *VolumeObservationContext = @"VolumeObservationContext";
       break;
   }
 
-  [self.audioManagerModule sendEventWithName:@"onRouteChange" body:@{@"reason" : @"reasonStr"}];
+  NSDictionary *body = @{@"reason" : reasonStr};
+
+  [self.audioAPIModule invokeHandlerWithEventName:@"routeChange" eventBody:body];
 }
 
 - (void)handleMediaServicesReset:(NSNotification *)notification
 {
   NSLog(@"[NotificationManager] Media services have been reset, tearing down and rebuilding everything.");
-  AudioEngine *audioEngine = [AudioEngine sharedInstance];
-  AudioSessionManager *audioSessionManager = [AudioSessionManager sharedInstance];
+  AudioEngine *audioEngine = self.audioAPIModule.audioEngine;
+  AudioSessionManager *audioSessionManager = self.audioAPIModule.audioSessionManager;
 
   [self cleanup];
   [audioSessionManager configureAudioSession];
@@ -180,7 +172,7 @@ static NSString *VolumeObservationContext = @"VolumeObservationContext";
 
 - (void)handleEngineConfigurationChange:(NSNotification *)notification
 {
-  AudioEngine *audioEngine = [AudioEngine sharedInstance];
+  AudioEngine *audioEngine = self.audioAPIModule.audioEngine;
 
   if (![audioEngine isRunning]) {
     NSLog(

package/lib/commonjs/api.js

@@ -177,7 +177,7 @@ Object.defineProperty(exports, "useSystemVolume", {
     return _useSytemVolume.default;
   }
 });
-var _NativeAudioAPIModule = _interopRequireDefault(require("./specs/NativeAudioAPIModule"));
+var _specs = require("./specs");
 var _AudioBuffer = _interopRequireDefault(require("./core/AudioBuffer"));
 var _AudioBufferSourceNode = _interopRequireDefault(require("./core/AudioBufferSourceNode"));
 var _AudioContext = _interopRequireDefault(require("./core/AudioContext"));
@@ -202,10 +202,10 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
 /* eslint-disable no-var */
 
-if (global.createAudioContext == null || global.createOfflineAudioContext == null || global.createAudioRecorder == null) {
-  if (!_NativeAudioAPIModule.default) {
+if (global.createAudioContext == null || global.createOfflineAudioContext == null || global.createAudioRecorder == null || global.AudioEventEmitter == null) {
+  if (!_specs.NativeAudioAPIModule) {
     throw new Error(`Failed to install react-native-audio-api: The native module could not be found.`);
   }
-  _NativeAudioAPIModule.default.install();
+  _specs.NativeAudioAPIModule.install();
 }
 //# sourceMappingURL=api.js.map