diff --git a/.cache/clangd/index/ChargeAudio.hpp.B4F8ECF0C7F6CA38.idx b/.cache/clangd/index/ChargeAudio.hpp.B4F8ECF0C7F6CA38.idx new file mode 100644 index 0000000..69a5511 Binary files /dev/null and b/.cache/clangd/index/ChargeAudio.hpp.B4F8ECF0C7F6CA38.idx differ diff --git a/.cache/clangd/index/Engine.cpp.8BC53A20A9E24317.idx b/.cache/clangd/index/Engine.cpp.8BC53A20A9E24317.idx new file mode 100644 index 0000000..d4843c2 Binary files /dev/null and b/.cache/clangd/index/Engine.cpp.8BC53A20A9E24317.idx differ diff --git a/.cache/clangd/index/Sound.cpp.7181ED22A085F74C.idx b/.cache/clangd/index/Sound.cpp.7181ED22A085F74C.idx new file mode 100644 index 0000000..2b5b381 Binary files /dev/null and b/.cache/clangd/index/Sound.cpp.7181ED22A085F74C.idx differ diff --git a/.cache/clangd/index/ma_channel_combiner_node.c.EA472A406F073AED.idx b/.cache/clangd/index/ma_channel_combiner_node.c.EA472A406F073AED.idx new file mode 100644 index 0000000..1c246ed Binary files /dev/null and b/.cache/clangd/index/ma_channel_combiner_node.c.EA472A406F073AED.idx differ diff --git a/.cache/clangd/index/ma_channel_combiner_node.h.3089146306C0F7F8.idx b/.cache/clangd/index/ma_channel_combiner_node.h.3089146306C0F7F8.idx new file mode 100644 index 0000000..8d639f8 Binary files /dev/null and b/.cache/clangd/index/ma_channel_combiner_node.h.3089146306C0F7F8.idx differ diff --git a/.cache/clangd/index/ma_channel_separator_node.c.551385FA737BBB8E.idx b/.cache/clangd/index/ma_channel_separator_node.c.551385FA737BBB8E.idx new file mode 100644 index 0000000..269009a Binary files /dev/null and b/.cache/clangd/index/ma_channel_separator_node.c.551385FA737BBB8E.idx differ diff --git a/.cache/clangd/index/ma_channel_separator_node.h.700F4B41F94DD965.idx b/.cache/clangd/index/ma_channel_separator_node.h.700F4B41F94DD965.idx new file mode 100644 index 0000000..92820f2 Binary files /dev/null and b/.cache/clangd/index/ma_channel_separator_node.h.700F4B41F94DD965.idx differ diff --git a/.cache/clangd/index/ma_ltrim_node.c.1F1D9F87874A711B.idx b/.cache/clangd/index/ma_ltrim_node.c.1F1D9F87874A711B.idx new file mode 100644 index 0000000..77c601e Binary files /dev/null and b/.cache/clangd/index/ma_ltrim_node.c.1F1D9F87874A711B.idx differ diff --git a/.cache/clangd/index/ma_ltrim_node.h.9B38F500662F2C91.idx b/.cache/clangd/index/ma_ltrim_node.h.9B38F500662F2C91.idx new file mode 100644 index 0000000..ac78c4e Binary files /dev/null and b/.cache/clangd/index/ma_ltrim_node.h.9B38F500662F2C91.idx differ diff --git a/.cache/clangd/index/ma_reverb_node.c.5CDA62887FAFEC64.idx b/.cache/clangd/index/ma_reverb_node.c.5CDA62887FAFEC64.idx new file mode 100644 index 0000000..e21721b Binary files /dev/null and b/.cache/clangd/index/ma_reverb_node.c.5CDA62887FAFEC64.idx differ diff --git a/.cache/clangd/index/ma_reverb_node.h.66B927265598A3E1.idx b/.cache/clangd/index/ma_reverb_node.h.66B927265598A3E1.idx new file mode 100644 index 0000000..5f6ea28 Binary files /dev/null and b/.cache/clangd/index/ma_reverb_node.h.66B927265598A3E1.idx differ diff --git a/.cache/clangd/index/ma_vocoder_node.c.6933ED8910D107AC.idx b/.cache/clangd/index/ma_vocoder_node.c.6933ED8910D107AC.idx new file mode 100644 index 0000000..65075da Binary files /dev/null and b/.cache/clangd/index/ma_vocoder_node.c.6933ED8910D107AC.idx differ diff --git a/.cache/clangd/index/ma_vocoder_node.h.F61925706CFBA93F.idx b/.cache/clangd/index/ma_vocoder_node.h.F61925706CFBA93F.idx new file mode 100644 index 0000000..d3f16fd Binary files /dev/null and b/.cache/clangd/index/ma_vocoder_node.h.F61925706CFBA93F.idx differ diff --git a/.cache/clangd/index/miniaudio.c.A97DCE0B7D3B96B0.idx b/.cache/clangd/index/miniaudio.c.A97DCE0B7D3B96B0.idx new file mode 100644 index 0000000..f3ec30d Binary files /dev/null and b/.cache/clangd/index/miniaudio.c.A97DCE0B7D3B96B0.idx differ diff --git a/.cache/clangd/index/miniaudio.h.B3A92D167AF63945.idx b/.cache/clangd/index/miniaudio.h.B3A92D167AF63945.idx new file mode 100644 index 0000000..61b694d Binary files /dev/null and b/.cache/clangd/index/miniaudio.h.B3A92D167AF63945.idx differ diff --git a/.cache/clangd/index/miniaudio_libvorbis.c.882E42123E75E7D9.idx b/.cache/clangd/index/miniaudio_libvorbis.c.882E42123E75E7D9.idx new file mode 100644 index 0000000..e235364 Binary files /dev/null and b/.cache/clangd/index/miniaudio_libvorbis.c.882E42123E75E7D9.idx differ diff --git a/.cache/clangd/index/miniaudio_libvorbis.h.357BDC55E11E9C5C.idx b/.cache/clangd/index/miniaudio_libvorbis.h.357BDC55E11E9C5C.idx new file mode 100644 index 0000000..7b8a1b0 Binary files /dev/null and b/.cache/clangd/index/miniaudio_libvorbis.h.357BDC55E11E9C5C.idx differ diff --git a/.cache/clangd/index/verblib.h.9357C93409D4CD9C.idx b/.cache/clangd/index/verblib.h.9357C93409D4CD9C.idx new file mode 100644 index 0000000..539edcb Binary files /dev/null and b/.cache/clangd/index/verblib.h.9357C93409D4CD9C.idx differ diff --git a/.cache/clangd/index/voclib.h.B4732425DE423CC4.idx b/.cache/clangd/index/voclib.h.B4732425DE423CC4.idx new file mode 100644 index 0000000..d681226 Binary files /dev/null and b/.cache/clangd/index/voclib.h.B4732425DE423CC4.idx differ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8881d76..55e506b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.10) project(ChargeAudio VERSION 1.0) set(CMAKE_CXX_STANDARD 17) +set(CMAKE_EXPORT_COMPILE_COMMANDS 1) set(CMAKE_MODULE_PATH "modules/" ${CMAKE_MODULE_PATH}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address") endif() - add_subdirectory(lib/miniaudio) find_package(Corrade REQUIRED Main) @@ -20,7 +20,7 @@ pkg_check_modules(AVUTIL REQUIRED libavutil) pkg_check_modules(SWRESAMPLE REQUIRED libswresample) add_library(ChargeAudio SHARED "src/ChargeAudio.hpp" "src/Engine.cpp" - "src/Sound.cpp") + "src/Sound.cpp" "lib/miniaudio/miniaudio.c") target_link_libraries( ChargeAudio @@ -28,8 +28,10 @@ target_link_libraries( ${AVCODEC_LIBRARIES} ${AVUTIL_LIBRARIES} ${SWRESAMPLE_LIBRARIES}) target_include_directories( - ChargeAudio PUBLIC $ - $) + ChargeAudio + PUBLIC $ + $ + $) # Library install( @@ -41,6 +43,7 @@ install( # include install(FILES src/ChargeAudio.hpp DESTINATION include/Charge) +install(FILES lib/miniaudio/miniaudio.h DESTINATION include/Charge/miniaudio/) install( EXPORT ChargeAudioTargets diff --git a/src/ChargeAudio.hpp b/src/ChargeAudio.hpp index adf69b8..90f6455 100644 --- a/src/ChargeAudio.hpp +++ b/src/ChargeAudio.hpp @@ -1,11 +1,13 @@ #ifndef CHARGE_AUDIO_BASE_H #define CHARGE_AUDIO_BASE_H -#include "../lib/miniaudio/miniaudio.h" #include #include #include namespace ChargeAudio { +namespace { +#include "miniaudio/miniaudio.h" +} class Sound { public: ~Sound(); @@ -35,5 +37,6 @@ private: ma_engine maEngine; ma_result maResponse; }; + } // namespace ChargeAudio #endif