software-mansion · maciejmakowski2003 · Feb 6, 2026 · Jan 31, 2026 · Jan 31, 2026 · Jan 31, 2026
diff --git a/packages/audiodocs/docs/sources/audio-buffer.mdx b/packages/audiodocs/docs/sources/audio-buffer.mdx
@@ -18,15 +18,15 @@ Once you have data in `AudioBuffer`, audio can be played by passing it to [`Audi
 ## Constructor
 
 ```tsx
-constructor(context: BaseAudioContext, options: AudioBufferOptions)
+constructor(options: AudioBufferOptions)
 ```
 
 ### `AudioBufferOptions`
 
 | Parameter | Type | Default | Description |
 | :---: | :---: | :----: | :---- |
-| `numberOfChannels` <Optional /> | `number` | 1.0 | Number of [`channels`](/docs/sources/audio-buffer#properties) in buffer |
 | `length` | `number` | - | [`Length`](/docs/sources/audio-buffer#properties) of the buffer |
+| `numberOfChannels` <Optional /> | `number` | 1.0 | Number of [`channels`](/docs/sources/audio-buffer#properties) in buffer |
 | `sampleRate` | `number` | - | [`Sample rate`](/docs/sources/audio-buffer#properties) of the buffer in Hz |
 
 Or by using `BaseAudioContext` factory method:

diff --git a/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.cpp b/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.cpp
@@ -2,7 +2,7 @@
 #include <audioapi/utils/AudioBus.h>
 
 namespace audioapi {
-MyProcessorNode::MyProcessorNode(BaseAudioContext *context)
+MyProcessorNode::MyProcessorNode(std::shared_ptr<BaseAudioContext> context)
     : AudioNode(context) {
     isInitialized_ = true;
 }

diff --git a/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.h b/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.h
@@ -6,7 +6,7 @@ class AudioBus;
 
 class MyProcessorNode : public AudioNode {
 public:
-  explicit MyProcessorNode(BaseAudioContext *context);
+  explicit MyProcessorNode(std::shared_ptr<BaseAudioContext> context);
 
 protected:
   std::shared_ptr<AudioBus> processNode(const std::shared_ptr<AudioBus> &bus,

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/AudioAPIModuleInstaller.h b/packages/react-native-audio-api/common/cpp/audioapi/AudioAPIModuleInstaller.h
@@ -3,11 +3,13 @@
 #include <audioapi/HostObjects/AudioContextHostObject.h>
 #include <audioapi/HostObjects/OfflineAudioContextHostObject.h>
 #include <audioapi/HostObjects/inputs/AudioRecorderHostObject.h>
+#include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
 #include <audioapi/HostObjects/utils/AudioDecoderHostObject.h>
 #include <audioapi/HostObjects/utils/AudioStretcherHostObject.h>
 #include <audioapi/core/AudioContext.h>
 #include <audioapi/core/OfflineAudioContext.h>
 #include <audioapi/core/inputs/AudioRecorder.h>
+#include <audioapi/core/sources/AudioBuffer.h>
 #include <audioapi/jsi/JsiPromise.h>
 
 #include <audioapi/HostObjects/events/AudioEventHandlerRegistryHostObject.h>
@@ -36,13 +38,15 @@ class AudioAPIModuleInstaller {
         getCreateAudioRecorderFunction(jsiRuntime, audioEventHandlerRegistry);
     auto createOfflineAudioContext = getCreateOfflineAudioContextFunction(
         jsiRuntime, jsCallInvoker, audioEventHandlerRegistry, uiRuntime);
+    auto createAudioBuffer = getCrateAudioBufferFunction(jsiRuntime);
     auto createAudioDecoder = getCreateAudioDecoderFunction(jsiRuntime, jsCallInvoker);
     auto createAudioStretcher = getCreateAudioStretcherFunction(jsiRuntime, jsCallInvoker);
 
     jsiRuntime->global().setProperty(*jsiRuntime, "createAudioContext", createAudioContext);
     jsiRuntime->global().setProperty(*jsiRuntime, "createAudioRecorder", createAudioRecorder);
     jsiRuntime->global().setProperty(
         *jsiRuntime, "createOfflineAudioContext", createOfflineAudioContext);
+    jsiRuntime->global().setProperty(*jsiRuntime, "createAudioBuffer", createAudioBuffer);
     jsiRuntime->global().setProperty(*jsiRuntime, "createAudioDecoder", createAudioDecoder);
     jsiRuntime->global().setProperty(*jsiRuntime, "createAudioStretcher", createAudioStretcher);
 
@@ -63,7 +67,7 @@ class AudioAPIModuleInstaller {
     return jsi::Function::createFromHostFunction(
         *jsiRuntime,
         jsi::PropNameID::forAscii(*jsiRuntime, "createAudioContext"),
-        0,
+        1,
         [jsCallInvoker, audioEventHandlerRegistry, uiRuntime](
             jsi::Runtime &runtime,
             const jsi::Value &thisValue,
@@ -94,7 +98,7 @@ class AudioAPIModuleInstaller {
     return jsi::Function::createFromHostFunction(
         *jsiRuntime,
         jsi::PropNameID::forAscii(*jsiRuntime, "createOfflineAudioContext"),
-        0,
+        3,
         [jsCallInvoker, audioEventHandlerRegistry, uiRuntime](
             jsi::Runtime &runtime,
             const jsi::Value &thisValue,
@@ -181,6 +185,23 @@ class AudioAPIModuleInstaller {
           return jsi::Object::createFromHostObject(runtime, audioStretcherHostObject);
         });
   }
+
+  static jsi::Function getCrateAudioBufferFunction(jsi::Runtime *jsiRuntime) {
+    return jsi::Function::createFromHostFunction(
+        *jsiRuntime,
+        jsi::PropNameID::forAscii(*jsiRuntime, "createAudioStretcher"),
+        3,
+        [](jsi::Runtime &runtime, const jsi::Value &thisValue, const jsi::Value *args, size_t count)
+            -> jsi::Value {
+          auto numberOfChannels = static_cast<int>(args[0].getNumber());
+          auto length = static_cast<size_t>(args[1].getNumber());
+          auto sampleRate = static_cast<float>(args[2].getNumber());
+
+          auto audioBuffer = std::make_shared<AudioBuffer>(numberOfChannels, length, sampleRate);
+          auto audioBufferHostObject = std::make_shared<AudioBufferHostObject>(audioBuffer);
+          return jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+        });
+  }
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioNodeHostObject.cpp b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioNodeHostObject.cpp
@@ -7,7 +7,8 @@
 
 namespace audioapi {
 
-AudioNodeHostObject::AudioNodeHostObject(const std::shared_ptr<AudioNode> &node) : node_(node) {
+AudioNodeHostObject::AudioNodeHostObject(const std::shared_ptr<AudioNode> &node,
+                                         const AudioNodeOptions &options) : node_(node) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(AudioNodeHostObject, numberOfInputs),
       JSI_EXPORT_PROPERTY_GETTER(AudioNodeHostObject, numberOfOutputs),

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioNodeHostObject.h b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioNodeHostObject.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <audioapi/jsi/JsiHostObject.h>
+#include <audioapi/types/NodeOptions.h>
 
 #include <jsi/jsi.h>
 #include <memory>
@@ -13,7 +14,9 @@ class AudioNode;
 
 class AudioNodeHostObject : public JsiHostObject {
  public:
-  explicit AudioNodeHostObject(const std::shared_ptr<AudioNode> &node);
+  explicit AudioNodeHostObject(
+      const std::shared_ptr<AudioNode> &node,
+      const AudioNodeOptions &options = AudioNodeOptions());
   ~AudioNodeHostObject() override;
 
   JSI_PROPERTY_GETTER_DECL(numberOfInputs);

diff --git a/...ges/react-native-audio-api/common/cpp/audioapi/HostObjects/BaseAudioContextHostObject.cpp b/...ges/react-native-audio-api/common/cpp/audioapi/HostObjects/BaseAudioContextHostObject.cpp
@@ -60,7 +60,6 @@ BaseAudioContextHostObject::BaseAudioContextHostObject(
       JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createIIRFilter),
       JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createBufferSource),
       JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createBufferQueueSource),
-      JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createBuffer),
       JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createPeriodicWave),
       JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createConvolver),
       JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createAnalyser),
@@ -260,19 +259,6 @@ JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createBufferQueueSource) {
   return jsi::Object::createFromHostObject(runtime, bufferStreamSourceHostObject);
 }
 
-JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createBuffer) {
-  const auto options = args[0].asObject(runtime);
-  const auto audioBufferOptions =
-      audioapi::option_parser::parseAudioBufferOptions(runtime, options);
-  auto buffer = BaseAudioContext::createBuffer(audioBufferOptions);
-  auto bufferHostObject = std::make_shared<AudioBufferHostObject>(buffer);
-
-  auto jsiObject = jsi::Object::createFromHostObject(runtime, bufferHostObject);
-  jsiObject.setExternalMemoryPressure(runtime, bufferHostObject->getSizeInBytes());
-
-  return jsiObject;
-}
-
 JSI_HOST_FUNCTION_IMPL(BaseAudioContextHostObject, createPeriodicWave) {
   auto arrayBufferReal =
       args[0].getObject(runtime).getPropertyAsObject(runtime, "buffer").getArrayBuffer(runtime);

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/BaseAudioContextHostObject.h b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/BaseAudioContextHostObject.h
@@ -42,7 +42,6 @@ class BaseAudioContextHostObject : public JsiHostObject {
   JSI_HOST_FUNCTION_DECL(createIIRFilter);
   JSI_HOST_FUNCTION_DECL(createBufferSource);
   JSI_HOST_FUNCTION_DECL(createBufferQueueSource);
-  JSI_HOST_FUNCTION_DECL(createBuffer);
   JSI_HOST_FUNCTION_DECL(createPeriodicWave);
   JSI_HOST_FUNCTION_DECL(createAnalyser);
   JSI_HOST_FUNCTION_DECL(createConvolver);

diff --git a/...eact-native-audio-api/common/cpp/audioapi/HostObjects/analysis/AnalyserNodeHostObject.cpp b/...eact-native-audio-api/common/cpp/audioapi/HostObjects/analysis/AnalyserNodeHostObject.cpp
@@ -1,5 +1,5 @@
 #include <audioapi/HostObjects/analysis/AnalyserNodeHostObject.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/analysis/AnalyserNode.h>
@@ -9,7 +9,7 @@
 namespace audioapi {
 
 AnalyserNodeHostObject::AnalyserNodeHostObject(const std::shared_ptr<BaseAudioContext>& context, const AnalyserOptions &options)
-    : AudioNodeHostObject(context->createAnalyser(options)) {
+    : AudioNodeHostObject(context->createAnalyser(options), options) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(AnalyserNodeHostObject, fftSize),
       JSI_EXPORT_PROPERTY_GETTER(AnalyserNodeHostObject, frequencyBinCount),

diff --git a/...e-audio-api/common/cpp/audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h b/...e-audio-api/common/cpp/audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h
@@ -2,6 +2,7 @@
 
 #include <audioapi/HostObjects/AudioNodeHostObject.h>
 #include <audioapi/core/destinations/AudioDestinationNode.h>
+#include <audioapi/types/NodeOptions.h>
 
 #include <memory>
 #include <vector>
@@ -12,6 +13,6 @@ using namespace facebook;
 class AudioDestinationNodeHostObject : public AudioNodeHostObject {
  public:
   explicit AudioDestinationNodeHostObject(const std::shared_ptr<AudioDestinationNode> &node)
-      : AudioNodeHostObject(node) {}
+      : AudioNodeHostObject(node, AudioDestinationOptions()) {}
 };
 } // namespace audioapi
diff --git a/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/BiquadFilterNodeHostObject.cpp b/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/BiquadFilterNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/effects/BiquadFilterNodeHostObject.h>
 #include <audioapi/HostObjects/AudioParamHostObject.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/BiquadFilterNode.h>
 #include <audioapi/core/types/BiquadFilterType.h>
@@ -12,7 +12,7 @@ namespace audioapi {
 
 BiquadFilterNodeHostObject::BiquadFilterNodeHostObject(const std::shared_ptr<BaseAudioContext>& context,
                                                        const BiquadFilterOptions &options)
-    : AudioNodeHostObject(context->createBiquadFilter(options)) {
+    : AudioNodeHostObject(context->createBiquadFilter(options), options) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(BiquadFilterNodeHostObject, frequency),
       JSI_EXPORT_PROPERTY_GETTER(BiquadFilterNodeHostObject, detune),

diff --git a/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/ConvolverNodeHostObject.cpp b/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/ConvolverNodeHostObject.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/HostObjects/effects/ConvolverNodeHostObject.h>
 #include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/ConvolverNode.h>
 
@@ -9,7 +9,7 @@
 namespace audioapi {
 
 ConvolverNodeHostObject::ConvolverNodeHostObject(const std::shared_ptr<BaseAudioContext>& context, const ConvolverOptions &options)
-    : AudioNodeHostObject(context->createConvolver(options)) {
+    : AudioNodeHostObject(context->createConvolver(options), options) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(ConvolverNodeHostObject, normalize),
       JSI_EXPORT_PROPERTY_GETTER(ConvolverNodeHostObject, buffer));

diff --git a/...es/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/DelayNodeHostObject.cpp b/...es/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/DelayNodeHostObject.cpp
@@ -2,14 +2,14 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/DelayNode.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 
 #include <memory>
 
 namespace audioapi {
 
 DelayNodeHostObject::DelayNodeHostObject(const std::shared_ptr<BaseAudioContext>& context, const DelayOptions &options)
-    : AudioNodeHostObject(context->createDelay(options)) {
+    : AudioNodeHostObject(context->createDelay(options), options) {
   addGetters(JSI_EXPORT_PROPERTY_GETTER(DelayNodeHostObject, delayTime));
 }
 

diff --git a/...ges/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/GainNodeHostObject.cpp b/...ges/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/GainNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/effects/GainNodeHostObject.h>
 
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/GainNode.h>
 #include <memory>
@@ -11,7 +11,7 @@ namespace audioapi {
 GainNodeHostObject::GainNodeHostObject(
     const std::shared_ptr<BaseAudioContext> &context,
     const GainOptions &options)
-    : AudioNodeHostObject(context->createGain(options)) {
+    : AudioNodeHostObject(context->createGain(options), options) {
   addGetters(JSI_EXPORT_PROPERTY_GETTER(GainNodeHostObject, gain));
 }
 

diff --git a/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/IIRFilterNodeHostObject.cpp b/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/IIRFilterNodeHostObject.cpp
@@ -1,5 +1,5 @@
 #include <audioapi/HostObjects/effects/IIRFilterNodeHostObject.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/IIRFilterNode.h>
 #include <memory>
@@ -9,7 +9,7 @@ namespace audioapi {
 IIRFilterNodeHostObject::IIRFilterNodeHostObject(
     const std::shared_ptr<BaseAudioContext> &context,
     const IIRFilterOptions &options)
-    : AudioNodeHostObject(context->createIIRFilter(options)) {
+    : AudioNodeHostObject(context->createIIRFilter(options), options) {
 
   addFunctions(JSI_EXPORT_FUNCTION(IIRFilterNodeHostObject, getFrequencyResponse));
 }

diff --git a/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/StereoPannerNodeHostObject.cpp b/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/StereoPannerNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/effects/StereoPannerNodeHostObject.h>
 
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/StereoPannerNode.h>
 #include <memory>
@@ -11,7 +11,7 @@ namespace audioapi {
 StereoPannerNodeHostObject::StereoPannerNodeHostObject(
     const std::shared_ptr<BaseAudioContext> &context,
     const StereoPannerOptions &options)
-    : AudioNodeHostObject(context->createStereoPanner(options)) {
+    : AudioNodeHostObject(context->createStereoPanner(options), options) {
   addGetters(JSI_EXPORT_PROPERTY_GETTER(StereoPannerNodeHostObject, pan));
 }
 

diff --git a/...act-native-audio-api/common/cpp/audioapi/HostObjects/effects/WaveShaperNodeHostObject.cpp b/...act-native-audio-api/common/cpp/audioapi/HostObjects/effects/WaveShaperNodeHostObject.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/HostObjects/effects/WaveShaperNodeHostObject.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/WaveShaperNode.h>
 #include <audioapi/jsi/AudioArrayBuffer.h>
@@ -13,7 +13,7 @@ namespace audioapi {
 WaveShaperNodeHostObject::WaveShaperNodeHostObject(
     const std::shared_ptr<BaseAudioContext> &context,
     const WaveShaperOptions &options)
-    : AudioNodeHostObject(context->createWaveShaper(options)) {
+    : AudioNodeHostObject(context->createWaveShaper(options), options) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(WaveShaperNodeHostObject, oversample),
       JSI_EXPORT_PROPERTY_GETTER(WaveShaperNodeHostObject, curve));

diff --git a/...audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.cpp b/...audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.cpp
@@ -2,13 +2,15 @@
 
 #include <audioapi/HostObjects/AudioParamHostObject.h>
 #include <audioapi/core/sources/AudioBufferBaseSourceNode.h>
+#include <audioapi/types/NodeOptions.h>
 #include <memory>
 
 namespace audioapi {
 
 AudioBufferBaseSourceNodeHostObject::AudioBufferBaseSourceNodeHostObject(
-    const std::shared_ptr<AudioBufferBaseSourceNode> &node)
-    : AudioScheduledSourceNodeHostObject(node) {
+    const std::shared_ptr<AudioBufferBaseSourceNode> &node,
+    const BaseAudioBufferSourceOptions &options)
+    : AudioScheduledSourceNodeHostObject(node, options) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, detune),
       JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, playbackRate),

diff --git a/...e-audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.h b/...e-audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.h
@@ -9,11 +9,13 @@ namespace audioapi {
 using namespace facebook;
 
 class AudioBufferBaseSourceNode;
+struct BaseAudioBufferSourceOptions;
 
 class AudioBufferBaseSourceNodeHostObject : public AudioScheduledSourceNodeHostObject {
  public:
   explicit AudioBufferBaseSourceNodeHostObject(
-      const std::shared_ptr<AudioBufferBaseSourceNode> &node);
+      const std::shared_ptr<AudioBufferBaseSourceNode> &node,
+      const BaseAudioBufferSourceOptions &options);
 
   ~AudioBufferBaseSourceNodeHostObject() override;
 

diff --git a/...udio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.cpp b/...udio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.h>
 
 #include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/AudioBufferQueueSourceNode.h>
 #include <memory>
@@ -11,7 +11,7 @@ namespace audioapi {
 AudioBufferQueueSourceNodeHostObject::AudioBufferQueueSourceNodeHostObject(
     const std::shared_ptr<BaseAudioContext> &context,
     const BaseAudioBufferSourceOptions &options)
-    : AudioBufferBaseSourceNodeHostObject(context->createBufferQueueSource(options)) {
+    : AudioBufferBaseSourceNodeHostObject(context->createBufferQueueSource(options), options) {
   functions_->erase("start");
 
   addSetters(JSI_EXPORT_PROPERTY_SETTER(AudioBufferQueueSourceNodeHostObject, onBufferEnded));

diff --git a/...ive-audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.cpp b/...ive-audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.h>
 
 #include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
-#include <audioapi/HostObjects/utils/NodeOptions.h>
+#include <audioapi/types/NodeOptions.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/AudioBufferSourceNode.h>
 #include <memory>
@@ -11,7 +11,7 @@ namespace audioapi {
 AudioBufferSourceNodeHostObject::AudioBufferSourceNodeHostObject(
     const std::shared_ptr<BaseAudioContext> &context,
     const AudioBufferSourceOptions &options)
-    : AudioBufferBaseSourceNodeHostObject(context->createBufferSource(options)) {
+    : AudioBufferBaseSourceNodeHostObject(context->createBufferSource(options), options) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(AudioBufferSourceNodeHostObject, loop),
       JSI_EXPORT_PROPERTY_GETTER(AudioBufferSourceNodeHostObject, loopSkip),