From cb396ba7a6121e45be74bfcd59e8d30408c43b8b Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Fri, 24 Jan 2020 11:15:11 +0100 Subject: [PATCH] NOOP - whitespace --- cmake/SfizzConfig.cmake | 2 +- scripts/Dockerfile | 6 +++--- scripts/docker_lv2_release.sh | 2 +- scripts/sfizz.pc.in | 2 +- scripts/sfz_sample_checks.py | 4 ++-- scripts/x64-linux-hidden.cmake | 2 +- src/sfizz/ScopedFTZ.cpp | 4 ++-- src/sfizz/ScopedFTZ.h | 4 ++-- src/sfizz/SfzHelpers.cpp | 12 ++++++------ src/sfizz/Synth.cpp | 4 ++-- src/sfizz/sfizz.cpp | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake index 5acb2be0..afa43821 100644 --- a/cmake/SfizzConfig.cmake +++ b/cmake/SfizzConfig.cmake @@ -30,7 +30,7 @@ if (WIN32 OR SFIZZ_USE_VCPKG) find_package(LibSndFile REQUIRED) find_path(SNDFILE_INCLUDE_DIR sndfile.hh) endif() - + function(SFIZZ_LINK_LIBSNDFILE TARGET) if (WIN32 OR SFIZZ_USE_VCPKG) target_link_libraries (${TARGET} PRIVATE sndfile-static) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 055995ff..1a1103ba 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -8,10 +8,10 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul && apt-get install -y cmake RUN cd /tmp \ - && git clone https://github.com/Microsoft/vcpkg.git \ + && git clone https://github.com/Microsoft/vcpkg.git \ && cd vcpkg \ && ./bootstrap-vcpkg.sh -disableMetrics \ - && ./vcpkg integrate install + && ./vcpkg integrate install COPY x64-linux-hidden.cmake . @@ -23,4 +23,4 @@ RUN cd /tmp \ && mkdir build \ && cd build \ && cmake .. -DSFIZZ_JACK=OFF -DSFIZZ_SHARED=OFF "-DCMAKE_TOOLCHAIN_FILE=/tmp/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-linux-hidden -DCMAKE_BUILD_TYPE=Release -DSFIZZ_USE_VCPKG=ON\ - && make -j 16 \ No newline at end of file + && make -j 16 diff --git a/scripts/docker_lv2_release.sh b/scripts/docker_lv2_release.sh index 8c01c28a..d0988c00 100755 --- a/scripts/docker_lv2_release.sh +++ b/scripts/docker_lv2_release.sh @@ -3,4 +3,4 @@ script_dir="$(dirname "$0")" pushd $script_dir docker build -t sfizz . popd -docker cp $(docker create sfizz:latest):/tmp/sfizz/build/sfizz.lv2 . \ No newline at end of file +docker cp $(docker create sfizz:latest):/tmp/sfizz/build/sfizz.lv2 . diff --git a/scripts/sfizz.pc.in b/scripts/sfizz.pc.in index 7425be7e..f5becc4b 100644 --- a/scripts/sfizz.pc.in +++ b/scripts/sfizz.pc.in @@ -9,4 +9,4 @@ Version: @PROJECT_VERSION@ Requires.private: sndfile Libs: -L${libdir} -l@PROJECT_NAME@ -Cflags: -I${includedir} \ No newline at end of file +Cflags: -I${includedir} diff --git a/scripts/sfz_sample_checks.py b/scripts/sfz_sample_checks.py index 359b6266..439e5f9c 100755 --- a/scripts/sfz_sample_checks.py +++ b/scripts/sfz_sample_checks.py @@ -23,7 +23,7 @@ def case_insensitive_check(filename): if path != '': path += '/' found = False - + if os.path.exists(root_directory + path + e): path += e continue @@ -69,4 +69,4 @@ else: print("Writing corrected file to", output_file) with open(output_file, 'w') as file: - file.write(output_content) \ No newline at end of file + file.write(output_content) diff --git a/scripts/x64-linux-hidden.cmake b/scripts/x64-linux-hidden.cmake index 387ff1e1..f7535c0c 100644 --- a/scripts/x64-linux-hidden.cmake +++ b/scripts/x64-linux-hidden.cmake @@ -3,4 +3,4 @@ set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fvisibility=hidden") -set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fvisibility=hidden") \ No newline at end of file +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fvisibility=hidden") diff --git a/src/sfizz/ScopedFTZ.cpp b/src/sfizz/ScopedFTZ.cpp index fb871f06..70d83d74 100644 --- a/src/sfizz/ScopedFTZ.cpp +++ b/src/sfizz/ScopedFTZ.cpp @@ -23,7 +23,7 @@ #include "ScopedFTZ.h" #if (HAVE_X86INTRIN_H) -#include +#include #elif (HAVE_INTRIN_H) #include #elif (HAVE_ARM_NEON_H) @@ -51,4 +51,4 @@ ScopedFTZ::~ScopedFTZ() #elif HAVE_ARM_NEON_H asm volatile("vmsr %0, fpscr" : : "ri"(registerState)); #endif -} \ No newline at end of file +} diff --git a/src/sfizz/ScopedFTZ.h b/src/sfizz/ScopedFTZ.h index 1db03bbc..bef19e84 100644 --- a/src/sfizz/ScopedFTZ.h +++ b/src/sfizz/ScopedFTZ.h @@ -23,7 +23,7 @@ /** * @brief Flush floating points to zero and disable denormals as an RAII helper. - * + * */ class ScopedFTZ { @@ -32,4 +32,4 @@ public: ~ScopedFTZ(); private: unsigned registerState; -}; \ No newline at end of file +}; diff --git a/src/sfizz/SfzHelpers.cpp b/src/sfizz/SfzHelpers.cpp index 7239b30c..5c079937 100644 --- a/src/sfizz/SfzHelpers.cpp +++ b/src/sfizz/SfzHelpers.cpp @@ -198,7 +198,7 @@ bool sfz::findOpcode(absl::string_view& source, absl::string_view& opcode, absl: auto opcodeEnd = source.find("="); if (opcodeEnd == absl::string_view::npos) return false; - + const auto valueStart = opcodeEnd + 1; const auto nextOpcodeEnd = source.find("=", valueStart); @@ -212,11 +212,11 @@ bool sfz::findOpcode(absl::string_view& source, absl::string_view& opcode, absl: auto valueEnd = nextOpcodeEnd; while (source[valueEnd] != ' ' && valueEnd != valueStart) valueEnd--; - + opcode = source.substr(0, opcodeEnd); value = source.substr(valueStart, valueEnd - valueStart); source.remove_prefix(valueEnd); - return true; + return true; } @@ -225,7 +225,7 @@ bool sfz::findDefine(absl::string_view line, absl::string_view& variable, absl:: const auto defPosition = line.find("#define"); if (defPosition == absl::string_view::npos) return false; - + const auto variableStart = line.find("$", 7); if (variableStart == absl::string_view::npos) return false; @@ -240,7 +240,7 @@ bool sfz::findDefine(absl::string_view line, absl::string_view& variable, absl:: const auto valueEnd = line.find_first_of(" \r\t\n\f\v", valueStart); variable = line.substr(variableStart, variableEnd - variableStart); - value = valueEnd != absl::string_view::npos + value = valueEnd != absl::string_view::npos ? line.substr(valueStart, valueEnd - valueStart) : line.substr(valueStart); return true; @@ -251,7 +251,7 @@ bool sfz::findInclude(absl::string_view line, std::string& path) const auto defPosition = line.find("#include"); if (defPosition == absl::string_view::npos) return false; - + const auto pathStart = line.find("\"", 8); if (pathStart == absl::string_view::npos) return false; diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index 1c8b7277..49d0137c 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -382,7 +382,7 @@ void sfz::Synth::renderBlock(AudioSpan buffer) noexcept const auto callbackStartTime = std::chrono::high_resolution_clock::now(); buffer.fill(0.0f); - + resources.filePool.cleanupPromises(); if (freeWheeling) @@ -490,7 +490,7 @@ void sfz::Synth::cc(int delay, int ccNumber, uint8_t ccValue) noexcept resetAllControllers(delay); return; } - + midiState.ccEvent(ccNumber, ccValue); for (auto& voice : voices) voice->registerCC(delay, ccNumber, ccValue); diff --git a/src/sfizz/sfizz.cpp b/src/sfizz/sfizz.cpp index 4fde9f9c..1032f363 100644 --- a/src/sfizz/sfizz.cpp +++ b/src/sfizz/sfizz.cpp @@ -177,4 +177,4 @@ void sfz::Sfizz::disableFreeWheeling() noexcept bool sfz::Sfizz::shouldReloadFile() { return synth->shouldReloadFile(); -} \ No newline at end of file +}