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

package/RNAudioAPI.podspec

@@ -22,7 +22,17 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/software-mansion-labs/react-native-audio-api.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm}", "common/cpp/**/*.{hpp,cpp,c,h}"
+  s.subspec "audioapi" do |ss|
+    ss.source_files = "common/cpp/audioapi/**/*.{cpp,c,h}"
+    ss.header_dir = "audioapi"
+    ss.header_mappings_dir = "common/cpp/audioapi"
+
+    ss.subspec "ios" do |sss|
+      sss.source_files = "ios/audioapi/**/*.{mm,h,m}"
+      sss.header_dir = "audioapi"
+      sss.header_mappings_dir = "ios/audioapi"
+    end
+  end
 
   s.ios.frameworks = 'CoreFoundation', 'CoreAudio', 'AudioToolbox', 'Accelerate'
 
@@ -45,13 +55,13 @@ Pod::Spec.new do |s|
       '"$(PODS_ROOT)/Headers/Public/React-hermes"',
       '"$(PODS_ROOT)/Headers/Public/hermes-engine"',
       "\"$(PODS_ROOT)/#{$config[:react_native_common_dir]}\"",
-      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/ios\"",
-      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/common/cpp\"",
+      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/ios/audioapi/ios\"",
+      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/common/cpp/audioapi\"",
     ].join(' '),
     'OTHER_CFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag}"
   }
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-  install_modules_dependencies(s, new_arch_enabled: true)
+  install_modules_dependencies(s)
 end

package/android/CMakeLists.txt

@@ -14,54 +14,15 @@ endif()
 include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
 add_compile_options(${folly_FLAGS})
 
-file(GLOB_RECURSE ANDROID_CPP_SOURCES CONFIGURE_DEPENDS "src/main/cpp/*.cpp")
-file(GLOB_RECURSE ANDROID_C_SOURCES CONFIGURE_DEPENDS "src/main/cpp/*.c")
-file(GLOB_RECURSE COMMON_CPP_SOURCES CONFIGURE_DEPENDS "../common/cpp/*.cpp")
+# string(APPEND CMAKE_CXX_FLAGS
+#        " -fexceptions -fno-omit-frame-pointer -frtti -fstack-protector-all\
+#    -std=c++${CMAKE_CXX_STANDARD} -Wall -Werror")
 
-add_library(react-native-audio-api SHARED ${ANDROID_CPP_SOURCES} ${ANDROID_C_SOURCES} ${COMMON_CPP_SOURCES})
-
-file(GLOB ANDROID_CPP_DIR CONFIGURE_DEPENDS "src/main/cpp/**")
-file(GLOB COMMON_CPP_DIR CONFIGURE_DEPENDS "../common/cpp/**")
-
-target_include_directories(
-  react-native-audio-api
-  PUBLIC
-  ${ANDROID_CPP_DIR}
-  ${COMMON_CPP_DIR}
-)
-
-target_include_directories(
-  react-native-audio-api
-  PRIVATE
-  "${REACT_NATIVE_DIR}/ReactCommon"
-  "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
-  "${REACT_NATIVE_DIR}/ReactCommon/react/nativemodule/core/ReactCommon"
-  "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
-)
-
-find_package(ReactAndroid REQUIRED CONFIG)
-find_package(fbjni REQUIRED CONFIG)
-find_package(oboe REQUIRED CONFIG)
-
-set(LINK_LIBRARIES
-  ReactAndroid::jsi
-  fbjni::fbjni
-  android
-  log
-  oboe::oboe
-)
-
-if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-  set(RN_VERSION_LINK_LIBRARIES
-    ReactAndroid::reactnative
-  )
-else()
-  set(RN_VERSION_LINK_LIBRARIES
-    ReactAndroid::folly_runtime
-    ReactAndroid::react_nativemodule_core
-    ReactAndroid::glog
-    ReactAndroid::reactnativejni
-  )
+if(${IS_NEW_ARCHITECTURE_ENABLED})
+  string(APPEND CMAKE_CXX_FLAGS " -DRCT_NEW_ARCH_ENABLED")
 endif()
 
-target_link_libraries(react-native-audio-api ${LINK_LIBRARIES} ${RN_VERSION_LINK_LIBRARIES})
+set(ANDROID_CPP_DIR "${CMAKE_SOURCE_DIR}/src/main/cpp")
+set(COMMON_CPP_DIR "${CMAKE_SOURCE_DIR}/../common/cpp")
+
+add_subdirectory("${ANDROID_CPP_DIR}/audioapi")

package/android/src/main/cpp/audioapi/CMakeLists.txt

@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.12.0)
+
+file(GLOB_RECURSE ANDROID_CPP_SOURCES CONFIGURE_DEPENDS "${ANDROID_CPP_DIR}/audioapi/*.cpp")
+file(GLOB_RECURSE ANDROID_C_SOURCES CONFIGURE_DEPENDS "${ANDROID_CPP_DIR}/audioapi/*.c")
+file(GLOB_RECURSE COMMON_CPP_SOURCES CONFIGURE_DEPENDS "${COMMON_CPP_DIR}/audioapi/*.cpp")
+
+add_library(react-native-audio-api SHARED ${ANDROID_CPP_SOURCES} ${ANDROID_C_SOURCES} ${COMMON_CPP_SOURCES})
+
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+find_package(oboe REQUIRED CONFIG)
+
+target_include_directories(
+  react-native-audio-api
+  PRIVATE
+  "${COMMON_CPP_DIR}"
+  "${ANDROID_CPP_DIR}"
+  "${REACT_NATIVE_DIR}/ReactCommon"
+  "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
+  "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
+)
+
+set(LINK_LIBRARIES
+  ReactAndroid::jsi
+  fbjni::fbjni
+  android
+  log
+  oboe::oboe
+)
+
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  set(RN_VERSION_LINK_LIBRARIES
+    ReactAndroid::reactnative
+  )
+else()
+  set(RN_VERSION_LINK_LIBRARIES
+    ReactAndroid::folly_runtime
+    ReactAndroid::react_nativemodule_core
+    ReactAndroid::glog
+    ReactAndroid::reactnativejni
+  )
+endif()
+
+target_link_libraries(react-native-audio-api ${LINK_LIBRARIES} ${RN_VERSION_LINK_LIBRARIES})

package/android/src/main/cpp/{AudioAPIModule.cpp → audioapi/android/AudioAPIModule.cpp}

@@ -1,7 +1,4 @@
-#include "AudioAPIModule.h"
-
-#include "AudioContext.h"
-#include "AudioContextHostObject.h"
+#include <audioapi/android/AudioAPIModule.h>
 
 namespace audioapi {
 

package/android/src/main/cpp/{AudioAPIModule.h → audioapi/android/AudioAPIModule.h}

@@ -1,12 +1,13 @@
 #pragma once
 
+#include <audioapi/AudioAPIModuleInstaller.h>
+
 #include <ReactCommon/CallInvokerHolder.h>
 #include <fbjni/fbjni.h>
 #include <react/jni/CxxModuleWrapper.h>
 #include <react/jni/JMessageQueueThread.h>
 #include <memory>
 #include <utility>
-#include "AudioAPIModuleInstaller.h"
 
 namespace audioapi {
 

package/android/src/main/cpp/{OnLoad.cpp → audioapi/android/OnLoad.cpp}

@@ -1,5 +1,6 @@
+#include <audioapi/android/AudioAPIModule.h>
+
 #include <fbjni/fbjni.h>
-#include "AudioAPIModule.h"
 
 using namespace audioapi;
 

package/android/src/main/cpp/{core → audioapi/android/core}/AudioDecoder.cpp

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

package/android/src/main/cpp/{core → audioapi/android/core}/AudioPlayer.cpp

@@ -1,10 +1,8 @@
-#include <cassert>
-
-#include "AudioArray.h"
-#include "AudioBus.h"
-#include "AudioContext.h"
-#include "AudioPlayer.h"
-#include "Constants.h"
+#include <audioapi/android/core/AudioPlayer.h>
+#include <audioapi/core/AudioContext.h>
+#include <audioapi/core/Constants.h>
+#include <audioapi/core/utils/AudioArray.h>
+#include <audioapi/core/utils/AudioBus.h>
 
 namespace audioapi {
 

package/android/src/main/cpp/{core → audioapi/android/core}/AudioPlayer.h

@@ -3,6 +3,7 @@
 #include <oboe/Oboe.h>
 #include <functional>
 #include <memory>
+#include <cassert>
 
 namespace audioapi {
 

package/android/src/main/cpp/{libs → audioapi/android/libs}/pffft.c

@@ -61,7 +61,7 @@
 #  define _USE_MATH_DEFINES // ask gently MSVC to define M_PI, M_SQRT2 etc.
 #endif
 
-#include "pffft.h"
+#include <audioapi/android/libs/pffft.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
@@ -1734,7 +1734,7 @@ void pffft_zconvolve_accumulate(PFFFT_Setup *s, const float *a, const float *b,
   bi0 = ((v4sf_union*)vb)[1].f[0];
   abr0 = ((v4sf_union*)vab)[0].f[0];
   abi0 = ((v4sf_union*)vab)[1].f[0];
- 
+
 #ifdef ZCONVOLVE_USING_INLINE_ASM // inline asm version, unfortunately miscompiled by clang 3.2, at least on ubuntu.. so this will be restricted to gcc
   const float *a_ = a, *b_ = b; float *ab_ = ab;
   int N = Ncvec;

package/android/src/main/java/com/swmansion/audioapi/AudioAPIPackage.kt

@@ -24,6 +24,7 @@ class AudioAPIPackage :
     }
 
   override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
+
     ReactModuleInfoProvider(
       fun (): Map<String, ReactModuleInfo> =
         mapOf(

package/common/cpp/{installer → audioapi}/AudioAPIModuleInstaller.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include <JsiPromise.h>
-#include "AudioContext.h"
-#include "AudioContextHostObject.h"
+#include <audioapi/jsi/JsiPromise.h>
+#include <audioapi/core/AudioContext.h>
+#include <audioapi/HostObjects/AudioContextHostObject.h>
+
+#include <memory>
 
 namespace audioapi {
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AnalyserNodeHostObject.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include <audioapi/core/analysis/AnalyserNode.h>
+#include <audioapi/HostObjects/AudioNodeHostObject.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "AnalyserNode.h"
-#include "AudioNodeHostObject.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AudioBufferHostObject.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <audioapi/jsi/JsiHostObject.h>
+#include <audioapi/core/sources/AudioBuffer.h>
+
 #include <jsi/jsi.h>
 #include <memory>
 #include <vector>
 #include <cstddef>
 
-#include <JsiHostObject.h>
-#include "AudioBuffer.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AudioBufferSourceNodeHostObject.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <audioapi/HostObjects/AudioBufferHostObject.h>
+#include <audioapi/core/sources/AudioBufferSourceNode.h>
+#include <audioapi/HostObjects/AudioParamHostObject.h>
+#include <audioapi/HostObjects/AudioScheduledSourceNodeHostObject.h>
+
 #include <memory>
 #include <vector>
 
-#include "AudioBufferHostObject.h"
-#include "AudioBufferSourceNode.h"
-#include "AudioParamHostObject.h"
-#include "AudioScheduledSourceNodeHostObject.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AudioContextHostObject.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <audioapi/core/AudioContext.h>
+#include <audioapi/HostObjects/BaseAudioContextHostObject.h>
+
 #include <jsi/jsi.h>
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include "AudioContext.h"
-#include "BaseAudioContextHostObject.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AudioDestinationNodeHostObject.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include <audioapi/core/destinations/AudioDestinationNode.h>
+#include <audioapi/HostObjects/AudioNodeHostObject.h>
+
 #include <memory>
 #include <vector>
 
-#include "AudioDestinationNode.h"
-#include "AudioNodeHostObject.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AudioNodeHostObject.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include <audioapi/jsi/JsiHostObject.h>
+#include <audioapi/core/AudioNode.h>
+
 #include <jsi/jsi.h>
 #include <memory>
 #include <vector>
 
-#include <JsiHostObject.h>
-#include "AudioNode.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AudioParamHostObject.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <audioapi/jsi/JsiHostObject.h>
+#include <audioapi/core/AudioParam.h>
+
 #include <jsi/jsi.h>
 #include <memory>
 #include <vector>
 #include <cstddef>
 
-#include <JsiHostObject.h>
-#include "AudioParam.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/AudioScheduledSourceNodeHostObject.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include <audioapi/HostObjects/AudioNodeHostObject.h>
+#include <audioapi/core/sources/AudioScheduledSourceNode.h>
+
 #include <memory>
 #include <vector>
 
-#include "AudioNodeHostObject.h"
-#include "AudioScheduledSourceNode.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/BaseAudioContextHostObject.h

@@ -1,26 +1,25 @@
 #pragma once
 
+#include <audioapi/jsi/JsiHostObject.h>
+#include <audioapi/jsi/JsiPromise.h>
+#include <audioapi/HostObjects/AudioBufferHostObject.h>
+#include <audioapi/HostObjects/AudioBufferSourceNodeHostObject.h>
+#include <audioapi/HostObjects/AudioDestinationNodeHostObject.h>
+#include <audioapi/core/BaseAudioContext.h>
+#include <audioapi/HostObjects/BiquadFilterNodeHostObject.h>
+#include <audioapi/HostObjects/GainNodeHostObject.h>
+#include <audioapi/HostObjects/OscillatorNodeHostObject.h>
+#include <audioapi/HostObjects/PeriodicWaveHostObject.h>
+#include <audioapi/HostObjects/StereoPannerNodeHostObject.h>
+#include <audioapi/HostObjects/AnalyserNodeHostObject.h>
+#include <audioapi/HostObjects/StretcherNodeHostObject.h>
+
 #include <jsi/jsi.h>
 #include <memory>
 #include <utility>
 #include <vector>
 #include <cstddef>
 
-#include <JsiHostObject.h>
-#include <JsiPromise.h>
-
-#include "AudioBufferHostObject.h"
-#include "AudioBufferSourceNodeHostObject.h"
-#include "AudioDestinationNodeHostObject.h"
-#include "BaseAudioContext.h"
-#include "BiquadFilterNodeHostObject.h"
-#include "GainNodeHostObject.h"
-#include "OscillatorNodeHostObject.h"
-#include "PeriodicWaveHostObject.h"
-#include "StereoPannerNodeHostObject.h"
-#include "AnalyserNodeHostObject.h"
-#include "StretcherNodeHostObject.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/BiquadFilterNodeHostObject.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <audioapi/HostObjects/AudioNodeHostObject.h>
+#include <audioapi/HostObjects/AudioParamHostObject.h>
+#include <audioapi/core/effects/BiquadFilterNode.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "AudioNodeHostObject.h"
-#include "AudioParamHostObject.h"
-#include "BiquadFilterNode.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/GainNodeHostObject.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include <audioapi/HostObjects/AudioNodeHostObject.h>
+#include <audioapi/HostObjects/AudioParamHostObject.h>
+#include <audioapi/core/effects/GainNode.h>
+
 #include <memory>
 #include <vector>
 
-#include "AudioNodeHostObject.h"
-#include "AudioParamHostObject.h"
-#include "GainNode.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/OscillatorNodeHostObject.h

@@ -1,14 +1,14 @@
 #pragma once
 
+#include <audioapi/HostObjects/AudioScheduledSourceNodeHostObject.h>
+#include <audioapi/HostObjects/AudioParamHostObject.h>
+#include <audioapi/HostObjects/PeriodicWaveHostObject.h>
+#include <audioapi/core/sources/OscillatorNode.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "AudioParamHostObject.h"
-#include "AudioScheduledSourceNodeHostObject.h"
-#include "OscillatorNode.h"
-#include "PeriodicWaveHostObject.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/PeriodicWaveHostObject.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include <audioapi/core/effects/PeriodicWave.h>
+
 #include <jsi/jsi.h>
 #include <memory>
 #include <vector>
 
-#include "PeriodicWave.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/{HostObjects → audioapi/HostObjects}/StereoPannerNodeHostObject.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <audioapi/HostObjects/AudioNodeHostObject.h>
+#include <audioapi/HostObjects/AudioParamHostObject.h>
+#include <audioapi/core/effects/StereoPannerNode.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "AudioNodeHostObject.h"
-#include "AudioParamHostObject.h"
-#include "StereoPannerNode.h"
-
 namespace audioapi {
 using namespace facebook;
 

package/common/cpp/audioapi/HostObjects/StretcherNodeHostObject.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <audioapi/HostObjects/AudioNodeHostObject.h>
+#include <audioapi/HostObjects/AudioParamHostObject.h>
+#include <audioapi/core/effects/StretcherNode.h>
+
+#include <memory>
+#include <vector>
+
+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

package/common/cpp/{core → audioapi/core}/AudioContext.cpp

@@ -1,13 +1,13 @@
 #ifdef ANDROID
-#include "AudioPlayer.h"
+#include <audioapi/android/core/AudioPlayer.h>
 #else
-#include "IOSAudioPlayer.h"
+#include <audioapi/ios/core/IOSAudioPlayer.h>
 #endif
 
-#include "AudioContext.h"
-#include "AudioDecoder.h"
-#include "AudioDestinationNode.h"
-#include "AudioNodeManager.h"
+#include <audioapi/core/AudioContext.h>
+#include <audioapi/core/destinations/AudioDestinationNode.h>
+#include <audioapi/core/utils/AudioDecoder.h>
+#include <audioapi/core/utils/AudioNodeManager.h>
 
 namespace audioapi {
 AudioContext::AudioContext() : BaseAudioContext() {

package/common/cpp/{core → audioapi/core}/AudioContext.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <audioapi/core/BaseAudioContext.h>
+
 #include <memory>
 #include <functional>
 
-#include "BaseAudioContext.h"
-
 namespace audioapi {
 #ifdef ANDROID
 class AudioPlayer;

package/common/cpp/{core → audioapi/core}/AudioNode.cpp

@@ -1,10 +1,8 @@
-#include <cassert>
-#include <memory>
-
-#include "AudioBus.h"
-#include "AudioNode.h"
-#include "AudioNodeManager.h"
-#include "BaseAudioContext.h"
+#include <audioapi/core/AudioNode.h>
+#include <audioapi/core/BaseAudioContext.h>
+#include <audioapi/core/utils/AudioArray.h>
+#include <audioapi/core/utils/AudioBus.h>
+#include <audioapi/core/utils/AudioNodeManager.h>
 
 namespace audioapi {
 

package/common/cpp/{core → audioapi/core}/AudioNode.h

@@ -1,14 +1,15 @@
 #pragma once
 
+#include <audioapi/core/types/ChannelCountMode.h>
+#include <audioapi/core/types/ChannelInterpretation.h>
+#include <audioapi/core/Constants.h>
+
 #include <memory>
 #include <string>
 #include <unordered_set>
 #include <cstddef>
 #include <vector>
-
-#include "ChannelCountMode.h"
-#include "ChannelInterpretation.h"
-#include "Constants.h"
+#include <cassert>
 
 namespace audioapi {
 

package/common/cpp/{core → audioapi/core}/AudioParam.cpp

@@ -1,7 +1,6 @@
-#include "AudioParam.h"
-
-#include "AudioUtils.h"
-#include "BaseAudioContext.h"
+#include <audioapi/core/AudioParam.h>
+#include <audioapi/core/BaseAudioContext.h>
+#include <audioapi/dsp/AudioUtils.h>
 
 namespace audioapi {