Merge branch 'main' into feat/android/gain-node

cpp/AudioContext/AudioContextHostObject.h

@@ -20,15 +20,15 @@ namespace audiocontext
         std::shared_ptr<AudioContextWrapper> wrapper_;
 
     public:
-        explicit AudioContextHostObject(const std::shared_ptr<AudioContextWrapper> &wrapper) : wrapper_(wrapper) {}
-
-        static void createAndInstallFromWrapper(const std::shared_ptr<AudioContextWrapper> &wrapper, jlong jsContext) {
+        explicit AudioContextHostObject(std::shared_ptr<AudioContextWrapper> wrapper) : wrapper_(wrapper) {}
+#ifdef ANDROID
+        static void createAndInstallFromWrapper(const std::shared_ptr<AudioContextWrapper>& wrapper, jlong jsContext) {
             auto runtime = reinterpret_cast<jsi::Runtime *>(jsContext);
             auto hostObject = std::make_shared<AudioContextHostObject>(wrapper);
             auto object = jsi::Object::createFromHostObject(*runtime, hostObject);
             runtime->global().setProperty(*runtime, "__AudioContext", std::move(object));
         }
-
+#endif
         jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &name) override;
         void set(jsi::Runtime &runtime, const jsi::PropNameID &name, const jsi::Value &value) override;
         std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;

cpp/AudioContext/AudioContextWrapper.h

@@ -8,6 +8,8 @@
 
 #ifdef ANDROID
 #include "AudioContext.h"
+#else
+#include "OscillatorNodeHostObject.h"
 #endif
 
 namespace audiocontext {

cpp/AudioContext/android/AudioContextWrapper.cpp

@@ -1,3 +1,4 @@
+#ifdef ANDROID
 #include "AudioContextWrapper.h"
 
 namespace audiocontext {
@@ -17,3 +18,4 @@ namespace audiocontext {
         return std::make_shared<GainNodeWrapper>(gain);
     }
 } // namespace audiocontext
+#endif

cpp/AudioContext/ios/AudioContextWrapper.cpp

@@ -0,0 +1,14 @@
+#ifndef ANDROID
+#include "AudioContextWrapper.h"
+
+namespace audiocontext {
+
+    std::shared_ptr<OscillatorNodeWrapper> AudioContextWrapper::createOscillator() {
+        return std::make_shared<OscillatorNodeWrapper>();
+    }
+
+    std::shared_ptr<AudioDestinationNodeWrapper> AudioContextWrapper::getDestination() {
+        throw std::runtime_error("[AudioContextHostObject::getDestination] Not yet implemented!");
+    }
+} // namespace audiocontext
+#endif

cpp/AudioDestinationNode/AudioDestinationNodeWrapper.h

@@ -7,8 +7,9 @@
 #include "AudioNodeWrapper.h"
 #endif
 
+#include "AudioNodeWrapper.h"
+
 namespace audiocontext {
-    using namespace facebook;
 
 #ifdef ANDROID
     class AudioDestinationNode;

cpp/AudioNode/AudioNodeWrapper.h

@@ -7,8 +7,6 @@
 #endif
 
 namespace audiocontext {
-    using namespace facebook;
-
     class AudioNodeWrapper {
 #ifdef ANDROID
     protected:

cpp/AudioNode/android/AudioNodeWrapper.cpp

@@ -1,3 +1,4 @@
+#ifdef ANDROID
 #include "AudioNodeWrapper.h"
 
 namespace audiocontext {
@@ -10,3 +11,5 @@ namespace audiocontext {
         node_->disconnect(node->node_);
     }
 }
+
+#endif

cpp/AudioNode/ios/AudioNodeWrapper.cpp

@@ -0,0 +1,15 @@
+#ifndef ANDROID
+#include "AudioNodeWrapper.h"
+#include "iostream"
+
+namespace audiocontext {
+
+    void AudioNodeWrapper::connect(const std::shared_ptr<AudioNodeWrapper> node) const {
+      throw std::runtime_error("[AudioNodeWrapper::connect] Not yet implemented!");
+   }
+
+    void AudioNodeWrapper::disconnect(const std::shared_ptr<AudioNodeWrapper> node) const {
+			throw std::runtime_error("[AudioNodeWrapper::disconnect] Not yet implemented!");
+    }
+}
+#endif

cpp/OscillatorNode/OscillatorNodeWrapper.h

@@ -5,25 +5,27 @@
 
 #ifdef ANDROID
 #include "OscillatorNode.h"
+#else
+#include "IOSOscillator.h"
 #endif
 
 namespace audiocontext {
-    using namespace facebook;
-
 #ifdef ANDROID
     class OscillatorNode;
 #endif
 
     class OscillatorNodeWrapper: public AudioNodeWrapper {
 #ifdef ANDROID
-    private:
         std::shared_ptr<OscillatorNode> oscillator_;
+#else
+        std::shared_ptr<IOSOscillator> oscillator_;
+#endif
+
     public:
         explicit OscillatorNodeWrapper(const std::shared_ptr<OscillatorNode> &oscillator) : AudioNodeWrapper(
                 oscillator), oscillator_(oscillator) {}
 #else
-    public:
-        explicit OscillatorNodeWrapper() {}
+        explicit OscillatorNodeWrapper() : oscillator_(std::make_shared<IOSOscillator>()) {}
 #endif
         double getFrequency();
         double getDetune();

cpp/OscillatorNode/android/OscillatorNodeWrapper.cpp

@@ -1,3 +1,4 @@
+#ifdef ANDROID
 #include "OscillatorNodeWrapper.h"
 
 namespace audiocontext {
@@ -34,3 +35,4 @@ namespace audiocontext {
         oscillator_->setWaveType(type);
     }
 }
+#endif

cpp/OscillatorNode/ios/OscillatorNodeWrapper.cpp

@@ -0,0 +1,38 @@
+#ifndef ANDROID
+#include "OscillatorNodeWrapper.h"
+
+namespace audiocontext {
+
+    double OscillatorNodeWrapper::getFrequency() {
+        return oscillator_->getFrequency();
+    }
+
+    double OscillatorNodeWrapper::getDetune() {
+        return oscillator_->getDetune();
+    }
+
+    std::string OscillatorNodeWrapper::getType() {
+        return oscillator_->getType();
+    }
+
+    void OscillatorNodeWrapper::start(double time) {
+        oscillator_->start();
+    }
+
+    void OscillatorNodeWrapper::stop(double time) {
+        oscillator_->stop();
+    }
+
+    void OscillatorNodeWrapper::setFrequency(double frequency) {
+        oscillator_->changeFrequency(frequency);
+    }
+
+    void OscillatorNodeWrapper::setDetune(double detune) {
+        oscillator_->changeDetune(detune);
+    }
+
+    void OscillatorNodeWrapper::setType(const std::string& type) {
+        oscillator_->setType(type);
+    }
+}
+#endif

example/src/App.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable react/react-in-jsx-scope */
-import { Button, StyleSheet, Text, View } from 'react-native';
+import { Button, Platform, StyleSheet, Text, View } from 'react-native';
 import { useRef, useState, useEffect } from 'react';
 import { Slider } from '@miblanchard/react-native-slider';
 
@@ -9,12 +9,12 @@ import {
   type Gain,
 } from 'react-native-audio-context';
 
-const App = () => {
+const App: React.FC = () => {
   const [isPlaying, setIsPlaying] = useState<boolean>(false);
   const [gain, setGain] = useState<number>(1.0);
   const [frequency, setFrequency] = useState<number>(440);
   const [detune, setDetune] = useState<number>(0);
-
+  
   const audioContextRef = useRef<AudioContext | null>(null);
   const oscillatorRef = useRef<Oscillator | null>(null);
   const gainRef = useRef<Gain | null>(null);
@@ -29,10 +29,11 @@ const App = () => {
 
     gainRef.current = audioContextRef.current.createGain();
     gainRef.current.gain = gain;
-
-    const destination = audioContextRef.current.destination;
-    oscillatorRef.current.connect(gainRef.current);
-    gainRef.current.connect(destination);
+
+    if (Platform.OS === 'android') {
+      const destination = audioContextRef.current.destination;
+      oscillatorRef.current.connect(destination!);
+    }
   };
 
   const handleGainChange = (value: number[]) => {
@@ -58,7 +59,7 @@ const App = () => {
       oscillatorRef.current.detune = newValue;
     }
   };
-
+  
   useEffect(() => {
     return () => {
       oscillatorRef.current?.stop(0);

ios/AudioContextModule.h

@@ -0,0 +1,5 @@
+#import <React/RCTBridgeModule.h>
+
+@interface AudioContextModule : NSObject <RCTBridgeModule>
+
+@end

ios/JSIExampleModule.mm → ios/AudioContextModule.mm

@@ -1,14 +1,15 @@
-#import "JSIExampleModule.h"
+#import "AudioContextModule.h"
 
 #import <React/RCTBridge+Private.h>
 #import <React/RCTUtils.h>
 #import <jsi/jsi.h>
 
-#import "../cpp/JSIExampleHostObject.h"
+#import "../cpp/AudioContext/AudioContextHostObject.h"
+#import "../cpp/AudioContext/AudioContextWrapper.h"
 
-@implementation JSIExampleModule
+@implementation AudioContextModule
 
-RCT_EXPORT_MODULE(JSIExample)
+RCT_EXPORT_MODULE(AudioContextModule)
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
@@ -27,9 +28,10 @@ @implementation JSIExampleModule
     }
     auto& runtime = *jsiRuntime;
 
-    auto hostObject = std::make_shared<example::JSIExampleHostObject>();
+    auto wrapper = std::make_shared<audiocontext::AudioContextWrapper>();
+    auto hostObject = std::make_shared<audiocontext::AudioContextHostObject>(wrapper);
     auto object = jsi::Object::createFromHostObject(runtime, hostObject);
-    runtime.global().setProperty(runtime, "__JSIExampleProxy", std::move(object));
+    runtime.global().setProperty(runtime, "__AudioContext", std::move(object));
 
     NSLog(@"Successfully installed JSI bindings for react-native-audio-context!");
     return @true;

ios/nodes/AudioNode/AudioNode.h

@@ -0,0 +1,14 @@
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVFoundation.h>
+
+@interface AudioNode : NSObject
+
+@property (nonatomic, readonly) NSInteger numberOfInputs;
+@property (nonatomic, readonly) NSInteger numberOfOutputs;
+@property (nonatomic, strong) NSMutableArray<AudioNode *> *connectedNodes;
+
+- (void)connect:(AudioNode *)node;
+- (void)disconnect;
+- (void)process;
+
+@end

ios/nodes/AudioNode/AudioNode.m

@@ -0,0 +1,29 @@
+#import "AudioNode.h"
+
+@implementation AudioNode
+
+- (instancetype)init {
+    if (self = [super init]) {
+        _connectedNodes = [NSMutableArray array];
+    }
+
+    return self;
+}
+
+- (void)connect:(AudioNode *)node {
+    if (self.numberOfOutputs > 0) {
+        [self.connectedNodes addObject:node];
+    }
+}
+
+- (void)disconnect {
+    [self.connectedNodes removeAllObjects];
+}
+
+- (void)process {
+    for (AudioNode *node in self.connectedNodes) {
+        [node process];
+    }
+}
+
+@end

ios/nodes/AudioScheduledSourceNode/AudioScheduledSourceNode.h

@@ -0,0 +1,8 @@
+#import "AudioNode.h"
+
+@interface AudioScheduledSourceNode : AudioNode
+
+- (void)start;
+- (void)stop;
+
+@end

ios/nodes/AudioScheduledSourceNode/AudioScheduledSourceNode.m

@@ -0,0 +1,20 @@
+#import "AudioScheduledSourceNode.h"
+
+@implementation AudioScheduledSourceNode
+
+- (void)start {
+    NSLog(@"Attempting to call `start` on a base class where it is not implemented. You must override `start` in a subclass.");
+    @throw [NSException exceptionWithName:NSInternalInconsistencyException
+                                   reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
+                                 userInfo:nil];
+}
+
+- (void)stop {
+    NSLog(@"Attempting to call `stop` on a base class where it is not implemented. You must override `stop` in a subclass.");
+    @throw [NSException exceptionWithName:NSInternalInconsistencyException
+                                   reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
+                                 userInfo:nil];
+}
+
+@end
+

ios/nodes/Oscillator/IOSOscillator.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#ifdef __OBJC__ // when compiled as Objective-C++
+#import <OscillatorNode.h>
+#else // when compiled as C++
+typedef struct objc_object OscillatorNode;
+#endif // __OBJC__
+
+#include <string>
+
+namespace audiocontext {
+	class IOSOscillator {
+		public:
+			explicit IOSOscillator();
+			void start() const;
+			void stop() const;
+            void changeFrequency(const float frequency) const;
+			float getFrequency() const;
+            void changeDetune(const float detune) const;
+            float getDetune() const;
+			void setType(const std::string &type) const;
+			std::string getType() const;
+
+		protected:
+			OscillatorNode *OscillatorNode_;
+	};
+} // namespace audiocontext