move AudioOut from orbis-kernel to rpcsx-os

RPCSX · Sep 25, 2024 · 7e01a65 · 7e01a65
1 parent 5d457af
commit 7e01a65
Show file tree

Hide file tree

Showing 9 changed files with 298 additions and 281 deletions.
diff --git a/orbis-kernel/CMakeLists.txt b/orbis-kernel/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(CMAKE_POSITION_INDEPENDENT_CODE on)
 
-find_package(sox REQUIRED)
-
 add_library(obj.orbis-utils-ipc OBJECT
   src/utils/SharedMutex.cpp
   src/utils/SharedCV.cpp
@@ -73,7 +71,7 @@ add_library(obj.orbis-kernel OBJECT
   src/utils/Logs.cpp
 )
 
-target_link_libraries(obj.orbis-kernel PUBLIC orbis::kernel::config $<TARGET_OBJECTS:obj.orbis-utils-ipc> sox::sox)
+target_link_libraries(obj.orbis-kernel PUBLIC orbis::kernel::config $<TARGET_OBJECTS:obj.orbis-utils-ipc>)
 
 target_include_directories(obj.orbis-kernel
     PUBLIC

diff --git a/orbis-kernel/include/orbis/AudioOut.hpp b/orbis-kernel/include/orbis/AudioOut.hpp
diff --git a/orbis-kernel/include/orbis/KernelContext.hpp b/orbis-kernel/include/orbis/KernelContext.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "AudioOut.hpp"
 #include "KernelAllocator.hpp"
 #include "evf.hpp"
 #include "ipmi.hpp"
@@ -178,7 +177,6 @@ class alignas(__STDCPP_DEFAULT_NEW_ALIGNMENT__) KernelContext final {
   Ref<RcBase> shmDevice;
   Ref<RcBase> dmemDevice;
   Ref<RcBase> blockpoolDevice;
-  AudioOut *audioOut = nullptr;
   uint sdkVersion{};
   uint fwSdkVersion{};
   uint safeMode{};