Dummy PR to compare miniaudio2 to upstream's dev

.gitignore

@@ -35,7 +35,3 @@ bin
 .DS_Store
 .vs
 /test
-deps/VrApi
-deps/pico
-deps/openxr
-deps/OpenXR-Oculus

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/lsalzman/enet
 [submodule "deps/glfw"]
 	path = deps/glfw
-	url = https://github.com/glfw/glfw
+	url = https://github.com/alloverse/glfw
 [submodule "deps/lua"]
 	path = deps/lua
 	url = https://github.com/LuaDist/lua
@@ -13,15 +13,21 @@
 [submodule "deps/ode"]
 	path = deps/ode
 	url = https://github.com/bjornbytes/ode
-[submodule "deps/openal-soft"]
-	path = deps/openal-soft
-	url = https://github.com/kcat/openal-soft
 [submodule "deps/openvr"]
 	path = deps/openvr
 	url = https://github.com/ValveSoftware/openvr
 [submodule "deps/luajit"]
 	path = deps/luajit
 	url = https://github.com/WohlSoft/LuaJIT
+[submodule "deps/oculus-mobile"]
+	path = deps/oculus-mobile
+	url = https://github.com/alloverse/ovr_sdk_mobile
+[submodule "deps/pico"]
+	path = deps/pico
+	url = https://github.com/alloverse/pico_native_sdk
+[submodule "deps/oculus-pc"]
+	path = deps/oculus-pc
+	url = https://github.com/alloverse/ovr_sdk_pc.git
 [submodule "deps/openxr"]
 	path = deps/openxr
 	url = https://github.com/khronosgroup/openxr-sdk

CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.1.0)
 cmake_policy(SET CMP0063 NEW)
+cmake_policy(SET CMP0042 NEW)
 project(lovr)
 
 # Options
@@ -21,7 +22,11 @@ option(LOVR_USE_LUAJIT "Use LuaJIT instead of Lua" ON)
 option(LOVR_USE_OPENVR "Enable the OpenVR backend for the headset module" ON)
 option(LOVR_USE_OPENXR "Enable the OpenXR backend for the headset module" OFF)
 option(LOVR_USE_WEBXR "Enable the WebXR backend for the headset module" OFF)
-option(LOVR_USE_OCULUS "Enable the LibOVR backend for the headset module (be sure to also set LOVR_OCULUS_PATH to point to the Oculus SDK)" OFF)
+if(WIN32)
+  option(LOVR_USE_OCULUS "Enable the LibOVR backend for the headset module (be sure to also set LOVR_OCULUS_PATH to point to the Oculus SDK)" ON)
+else()
+  option(LOVR_USE_OCULUS "Enable the LibOVR backend for the headset module (be sure to also set LOVR_OCULUS_PATH to point to the Oculus SDK)" OFF)
+endif()
 option(LOVR_USE_VRAPI "Enable the VrApi backend for the headset module" OFF)
 option(LOVR_USE_PICO "Enable the Pico backend for the headset module" OFF)
 option(LOVR_USE_DESKTOP_HEADSET "Enable the keyboard/mouse backend for the headset module" ON)
@@ -31,7 +36,6 @@ option(LOVR_SYSTEM_ENET "Use the system-provided enet" OFF)
 option(LOVR_SYSTEM_GLFW "Use the system-provided glfw" OFF)
 option(LOVR_SYSTEM_LUA "Use the system-provided Lua" OFF)
 option(LOVR_SYSTEM_ODE "Use the system-provided ODE" OFF)
-option(LOVR_SYSTEM_OPENAL "Use the system-provided OpenAL" OFF)
 option(LOVR_SYSTEM_OPENXR "Use the system-provided OpenXR" OFF)
 
 option(LOVR_BUILD_EXE "Build an executable (or an apk on Android)" ON)
@@ -110,7 +114,7 @@ endif()
 # Lua
 if(LOVR_USE_LUAJIT AND NOT EMSCRIPTEN)
   if (APPLE)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
+    set(LUAJIT_ENABLE_GC64 ON)
   endif()
   if(LOVR_SYSTEM_LUA)
     pkg_search_module(LUAJIT REQUIRED luajit)
@@ -172,35 +176,6 @@ if(LOVR_ENABLE_PHYSICS)
   endif()
 endif()
 
-# OpenAL
-if(LOVR_ENABLE_AUDIO)
-  if(LOVR_SYSTEM_OPENAL)
-    pkg_search_module(OPENAL openal-soft)
-    if (NOT OPENAL_FOUND)
-      pkg_search_module(OPENAL openal)
-      if (NOT OPENAL_FOUND)
-        message(FATAL_ERROR "OpenAL not found.")
-      endif()
-    endif()
-    include_directories(${OPENAL_INCLUDE_DIRS})
-    string(REPLACE ";" " " OPENAL_LDFLAGS_STR "${OPENAL_LDFLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OPENAL_LDFLAGS_STR}")
-    set(LOVR_OPENAL ${OPENAL_LIBRARIES})
-  else()
-    set(ALSOFT_UTILS OFF CACHE BOOL "")
-    set(ALSOFT_EXAMPLES OFF CACHE BOOL "")
-    set(ALSOFT_TESTS OFF CACHE BOOL "")
-    if(NOT EMSCRIPTEN)
-      add_subdirectory(deps/openal-soft openal)
-      set(LOVR_OPENAL OpenAL)
-      if(WIN32)
-        set_target_properties(OpenAL PROPERTIES COMPILE_FLAGS "/wd4005 /wd4098")
-      endif()
-    endif()
-    include_directories(deps/openal-soft/include)
-  endif()
-endif()
-
 # OpenGL
 if(NOT (WIN32 OR EMSCRIPTEN OR ANDROID))
   find_package(OpenGL REQUIRED)
@@ -256,9 +231,7 @@ endif()
 
 # Oculus SDK -- expects Oculus SDK 1.26.0 or later
 if(LOVR_ENABLE_HEADSET AND LOVR_USE_OCULUS)
-  if(NOT LOVR_OCULUS_PATH)
-    message(FATAL_ERROR "LOVR_USE_OCULUS requires the LOVR_OCULUS_PATH to be set to the location of the Oculus Desktop SDK (LibOVR) folder")
-  endif()
+  set(LOVR_OCULUS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/oculus-pc" CACHE STRING "location of the Oculus Desktop SDK folder")
   set(OCULUS_BUILD_TYPE "Release")
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(OCULUS_ARCH "x64")
@@ -267,12 +240,12 @@ if(LOVR_ENABLE_HEADSET AND LOVR_USE_OCULUS)
   endif()
   include_directories("${LOVR_OCULUS_PATH}/LibOVR/Include")
   link_directories("${LOVR_OCULUS_PATH}/LibOVR/Lib/Windows/${OCULUS_ARCH}/${OCULUS_BUILD_TYPE}/VS2017")
-  set(LOVR_OCULUS LibOVR)
+  set(LOVR_OCULUS "${LOVR_OCULUS_PATH}/LibOVR/Lib/Windows/${OCULUS_ARCH}/${OCULUS_BUILD_TYPE}/VS2017/LibOVR.lib")
 endif()
 
 # VrApi (Oculus Mobile SDK) -- tested on 1.34.0
 if(LOVR_ENABLE_HEADSET AND LOVR_USE_VRAPI)
-  set(LOVR_VRAPI_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/VrApi" CACHE STRING "The path to the VrApi folder of the Oculus Mobile SDK")
+  set(LOVR_VRAPI_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/oculus-mobile/VrApi" CACHE STRING "The path to the VrApi folder of the Oculus Mobile SDK")
   add_library(VrApi SHARED IMPORTED)
   include_directories("${LOVR_VRAPI_PATH}/Include")
   set_target_properties(VrApi PROPERTIES IMPORTED_LOCATION "${LOVR_VRAPI_PATH}/Libs/Android/${ANDROID_ABI}/Release/libvrapi.so")
@@ -281,7 +254,7 @@ endif()
 
 # Pico Native SDK (1.3.3)
 if(LOVR_ENABLE_HEADSET AND LOVR_USE_PICO)
-  set(LOVR_PICO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/pico" CACHE STRING "The path to the Pico SDK folder (unzipped aar)")
+  set(LOVR_PICO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/pico/aar" CACHE STRING "The path to the Pico SDK folder (unzipped aar)")
   add_library(Pvr_NativeSDK SHARED IMPORTED)
   set_target_properties(Pvr_NativeSDK PROPERTIES IMPORTED_LOCATION "${LOVR_PICO_PATH}/jni/${ANDROID_ABI}/libPvr_NativeSDK.so")
   set(LOVR_PICO Pvr_NativeSDK)
@@ -338,8 +311,10 @@ if(LOVR_USE_PICO)
 endif()
 
 if(LOVR_BUILD_SHARED)
+  add_definitions(-DLOVR_BUILDING_SHARED)
   add_library(lovr SHARED ${LOVR_SRC})
 elseif(LOVR_BUILD_EXE)
+  add_definitions(-DLOVR_BUILDING_EXE)
   add_executable(lovr ${LOVR_SRC})
 else()
   return()
@@ -354,7 +329,6 @@ target_link_libraries(lovr
   ${LOVR_LUA}
   ${LOVR_MSDF}
   ${LOVR_ODE}
-  ${LOVR_OPENAL}
   ${LOVR_OPENGL}
   ${LOVR_OPENVR}
   ${LOVR_OPENXR}
@@ -369,16 +343,16 @@ if(LOVR_ENABLE_AUDIO)
   add_definitions(-DLOVR_ENABLE_AUDIO)
   target_sources(lovr PRIVATE
     src/modules/audio/audio.c
+    src/modules/audio/spatializers/dummy_spatializer.c
     src/api/l_audio.c
     src/api/l_audio_source.c
-    src/api/l_audio_microphone.c
+    src/lib/miniaudio/miniaudio.c
   )
 endif()
 
 if(LOVR_ENABLE_DATA)
   add_definitions(-DLOVR_ENABLE_DATA)
   target_sources(lovr PRIVATE
-    src/modules/data/audioStream.c
     src/modules/data/blob.c
     src/modules/data/modelData.c
     src/modules/data/modelData_gltf.c
@@ -387,7 +361,6 @@ if(LOVR_ENABLE_DATA)
     src/modules/data/soundData.c
     src/modules/data/textureData.c
     src/api/l_data.c
-    src/api/l_data_audioStream.c
     src/api/l_data_blob.c
     src/api/l_data_modelData.c
     src/api/l_data_rasterizer.c
@@ -560,7 +533,6 @@ if(WIN32)
   move_dll(${LOVR_GLFW})
   move_dll(${LOVR_LUA})
   move_dll(${LOVR_ODE})
-  move_dll(${LOVR_OPENAL})
   move_dll(${LOVR_OPENVR})
   move_dll(${LOVR_MSDF})
   target_compile_definitions(lovr PRIVATE -DLOVR_GL)
@@ -582,7 +554,6 @@ elseif(APPLE)
     move_lib(${LOVR_GLFW})
     move_lib(${LOVR_LUA})
     move_lib(${LOVR_ODE})
-    move_lib(${LOVR_OPENAL})
     move_lib(${LOVR_OPENVR})
     move_lib(${LOVR_MSDF})
 
@@ -591,6 +562,7 @@ elseif(APPLE)
       MACOSX_BUNDLE TRUE
       MACOSX_RPATH TRUE
       BUILD_WITH_INSTALL_RPATH TRUE
+      INSTALL_NAME_DIR "@rpath"
       INSTALL_RPATH "@executable_path"
       MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Info.plist"
       RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/lovr.icns"
@@ -600,13 +572,13 @@ elseif(EMSCRIPTEN)
   target_sources(lovr PRIVATE src/core/os_web.c)
   target_compile_definitions(lovr PRIVATE -DLOVR_WEBGL)
 elseif(ANDROID)
-  target_link_libraries(lovr log EGL GLESv3 android)
+  target_link_libraries(lovr log EGL GLESv3 OpenSLES android)
   target_compile_definitions(lovr PRIVATE -DLOVR_GLES)
   target_include_directories(lovr PRIVATE "${ANDROID_NDK}/sources/android/native_app_glue")
 
   # Dynamically linked targets output libraries in lib/<ABI> for easy including in apk with aapt
   set_target_properties(
-    lovr ${LOVR_ODE} ${LOVR_OPENAL}
+    lovr ${LOVR_ODE}
     PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib/${ANDROID_ABI}"
   )
 
@@ -658,6 +630,10 @@ elseif(ANDROID)
       set(ANDROID_APKSIGNER_KEYSTORE_PASS --ks-pass)
     endif()
 
+    if (ANDROID_EXTRAPACKAGES) # Only pass --extra-packages if var is set
+      set(ANDROID_EXTRAPACKAGES --extra-packages ${ANDROID_EXTRAPACKAGES})
+    endif()
+
     # Make an apk
     add_custom_target(
       buildAPK ALL
@@ -672,6 +648,7 @@ elseif(ANDROID)
         -M AndroidManifest.xml
         -I ${ANDROID_JAR}
         -F lovr.unaligned.apk
+        ${ANDROID_EXTRAPACKAGES}
         ${ANDROID_ASSETS}
       COMMAND
         ${ANDROID_TOOLS}/aapt
@@ -682,10 +659,12 @@ elseif(ANDROID)
         sign
         --ks ${ANDROID_KEYSTORE}
         ${ANDROID_APKSIGNER_KEYSTORE_PASS} ${ANDROID_KEYSTORE_PASS}
+        $<$<BOOL:${ANDROID_KEY_PASS}>:--key-pass> $<$<BOOL:${ANDROID_KEY_PASS}>:${ANDROID_KEY_PASS}>
         --in lovr.unsigned.apk
         --out lovr.apk
       COMMAND ${CMAKE_COMMAND} -E remove lovr.unaligned.apk lovr.unsigned.apk AndroidManifest.xml Activity.java classes.dex
       COMMAND ${CMAKE_COMMAND} -E remove_directory org
+      DEPENDS lovr
     )
   endif()
 elseif(UNIX)

Tupfile

@@ -16,7 +16,7 @@ SRC += src/core/util.c
 SRC += src/core/zip.c
 
 # modules
-SRC_@(AUDIO) += src/modules/audio/*.c
+SRC_@(AUDIO) += src/modules/audio/audio.c
 SRC_@(DATA) += src/modules/data/*.c
 SRC_@(EVENT) += src/modules/event/*.c
 SRC_@(FILESYSTEM) += src/modules/filesystem/*.c
@@ -38,6 +38,7 @@ SRC_@(TIMER) += src/modules/timer/*.c
 SRC += src/lib/stb/*.c
 SRC_@(DATA) += src/lib/jsmn/jsmn.c
 SRC_@(GRAPHICS) += src/lib/glad/glad.c
+SRC_@(AUDIO) += src/lib/miniaudio/miniaudio.c
 SRC_@(MATH) += src/lib/noise1234/noise1234.c
 SRC_@(THREAD) += src/lib/tinycthread/tinycthread.c
 

src/api/api.h

@@ -19,7 +19,7 @@ LOVR_EXPORT int luaopen_lovr_math(lua_State* L);
 LOVR_EXPORT int luaopen_lovr_physics(lua_State* L);
 LOVR_EXPORT int luaopen_lovr_thread(lua_State* L);
 LOVR_EXPORT int luaopen_lovr_timer(lua_State* L);
-extern const luaL_Reg lovrModules[];
+LOVR_EXPORT extern const luaL_Reg lovrModules[];
 
 // Objects
 extern const luaL_Reg lovrAudioStream[];
@@ -96,6 +96,7 @@ extern StringEntry lovrStencilAction[];
 extern StringEntry lovrTextureFormat[];
 extern StringEntry lovrTextureType[];
 extern StringEntry lovrTimeUnit[];
+extern StringEntry lovrSampleFormat[];
 extern StringEntry lovrUniformAccess[];
 extern StringEntry lovrVerticalAlign[];
 extern StringEntry lovrWinding[];