From 51f84566c43951ec527cc78822a4e3d45d631f04 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sat, 25 Dec 2021 02:17:21 +0100 Subject: [PATCH] Radio Bugfix --- core/src/dsp/chain.h | 2 ++ .../discord_integration/discord-rpc/.clang-format | 4 ++++ .../discord_integration/discord-rpc/CMakeLists.txt | 14 -------------- .../discord-rpc/src/CMakeLists.txt | 6 +----- 4 files changed, 7 insertions(+), 19 deletions(-) create mode 100644 misc_modules/discord_integration/discord-rpc/.clang-format diff --git a/core/src/dsp/chain.h b/core/src/dsp/chain.h index 13a2fc1e..98c053c0 100644 --- a/core/src/dsp/chain.h +++ b/core/src/dsp/chain.h @@ -91,6 +91,7 @@ namespace dsp { for (auto i = ++lnit; i < links.end(); i++) { if (!(*i)->enabled) { continue; } nextLink = *i; + break; } if (nextLink) { @@ -133,6 +134,7 @@ namespace dsp { for (auto i = ++lnit; i < links.end(); i++) { if (!(*i)->enabled) { continue; } nextLink = *i; + break; } if (nextLink) { diff --git a/misc_modules/discord_integration/discord-rpc/.clang-format b/misc_modules/discord_integration/discord-rpc/.clang-format new file mode 100644 index 00000000..92e89b03 --- /dev/null +++ b/misc_modules/discord_integration/discord-rpc/.clang-format @@ -0,0 +1,4 @@ +--- +DisableFormat: true +... + diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt index 12b6cae5..1dc1c913 100644 --- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt +++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt @@ -9,20 +9,6 @@ file(GLOB_RECURSE ALL_SOURCE_FILES src/*.cpp src/*.h src/*.c ) -# Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g. clang-format-5.0 -find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX}) - -if (CLANG_FORMAT_CMD) - add_custom_target( - clangformat - COMMAND ${CLANG_FORMAT_CMD} - -i -style=file -fallback-style=none - ${ALL_SOURCE_FILES} - DEPENDS - ${ALL_SOURCE_FILES} - ) -endif(CLANG_FORMAT_CMD) - # add subdirs add_subdirectory(src) \ No newline at end of file diff --git a/misc_modules/discord_integration/discord-rpc/src/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/src/CMakeLists.txt index e5d1ce8b..bf57994a 100644 --- a/misc_modules/discord_integration/discord-rpc/src/CMakeLists.txt +++ b/misc_modules/discord_integration/discord-rpc/src/CMakeLists.txt @@ -118,8 +118,4 @@ endif (NOT ${ENABLE_IO_THREAD}) if (${BUILD_SHARED_LIBS}) target_compile_definitions(discord-rpc PUBLIC -DDISCORD_DYNAMIC_LIB) target_compile_definitions(discord-rpc PRIVATE -DDISCORD_BUILDING_SDK) -endif(${BUILD_SHARED_LIBS}) - -if (CLANG_FORMAT_CMD) - add_dependencies(discord-rpc clangformat) -endif(CLANG_FORMAT_CMD) \ No newline at end of file +endif(${BUILD_SHARED_LIBS}) \ No newline at end of file