Add toml++ and remove macOS-specific file

main
Thor 2 months ago
parent 3a0278b319
commit 8903adb93a
  1. 3
      .gitmodules
  2. 4
      CMakeLists.txt
  3. 1
      lib/tomlplusplus
  4. 6
      src/synthapp.cpp
  5. 1
      xctrace-command.txt

3
.gitmodules vendored

@ -10,3 +10,6 @@
[submodule "lib/synth"]
path = lib/synth
url = git@saga.berserker.town:klang-modular/libsynth.git
[submodule "lib/tomlplusplus"]
path = lib/tomlplusplus
url = https://github.com/marzer/tomlplusplus

@ -16,6 +16,8 @@ if(WIN32)
option(PA_USE_WDMKS "" OFF)
option(PA_USE_WDMKS_DEVICE_INFO "" OFF)
endif()
add_subdirectory(lib/tomlplusplus)
add_subdirectory(lib/portaudio)
add_subdirectory(lib/portmidi)
add_subdirectory(lib/wxWidgets)
@ -35,6 +37,8 @@ target_link_libraries(main PRIVATE synth)
#target_compile_options(main PRIVATE -fsanitize=thread)
#target_link_options(main PRIVATE -fsanitize=thread)
target_link_libraries(main PRIVATE tomlplusplus_tomlplusplus)
target_link_libraries(main PRIVATE PortAudio)
target_link_libraries(main PRIVATE portmidi)
target_include_directories(main PRIVATE lib/portmidi/porttime)

@ -0,0 +1 @@
Subproject commit a851257c493cc7adc54953d5609c0a85e0ef3ce3

@ -3,6 +3,8 @@
#include <cmath>
#include <mutex>
#include <toml++/toml.hpp>
#include "globals.h"
#include "util.h"
@ -189,7 +191,7 @@ bool SynthApp::OnInit() {
&paStream,
NULL, // no input channels
&paStreamParams, // stereo output
deviceInfo->defaultSampleRate,
96000, //deviceInfo->defaultSampleRate,
0, // frames per buffer
paNoFlag,
paCallback,
@ -237,4 +239,4 @@ int main(int argc, char** argv) {
LPSTR lpCmdLine = (LPSTR) calloc(1, 1);
return WinMain(module, NULL, lpCmdLine, SW_SHOW);
}
#endif
#endif

@ -1 +0,0 @@
xctrace record --template 'Time Profiler' --launch ./build/main
Loading…
Cancel
Save