Merge from default branch

2024-03-07 15:20:48 +00:00
parent c2fbd6f215 6915476164
commit 7d1294098a
89 changed files with 137 additions and 182 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,26 +0,0 @@
-
-image:
-  - Visual Studio 2019
-
-configuration:
-  - Release
-
-platform:
-  - x64
-
-install:
-  - cinst wget
-  - cinst libsndfile
-
-build_script:
-  - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - meson build "-Dextra_include_dirs=C:\Program Files\libsndfile\include" "-Dextra_lib_dirs=C:\Program Files\libsndfile\lib"
-  - ninja -C build
-  - meson test -C build
-  # Test the VC++ static library build, which is separate
-  - msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release
-  # Test the .NET FFI interface build, which is again separate
-  - msbuild dotnet\rubberband.sln /t:Restore;Build
-  # And test the single-file build
-  - cl main\main.cpp single\RubberBandSingle.cpp .\src\ext\getopt\getopt.c src\ext\getopt\getopt_long.c "C:\Program Files\libsndfile\lib\sndfile.lib" /O2 /std:c++14 /D_USE_MATH_DEFINES /DNOMINMAX /EHs /I"C:\Program Files\libsndfile\include" /link /out:test_single.exe
-
--- a/.github/workflows/macos-ios.yml
+++ b/.github/workflows/macos-ios.yml
@@ -14,9 +14,9 @@ jobs:
    - name: deps
      run: brew install libsndfile libsamplerate vamp-plugin-sdk meson ninja
    - name: configure macos
-      run: meson build_macos
+      run: meson setup build_macos
    - name: configure ios
-      run: meson build_ios --cross-file cross/ios.txt
+      run: meson setup build_ios --cross-file cross/ios.txt
    - name: make macos
      run: ninja -C build_macos
    - name: make ios
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,41 @@
+name: Windows CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: windows-2022
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: microsoft/setup-msbuild@v2
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+    - name: pipdeps
+      run: |
+        pip install meson
+        pip install ninja
+    - name: chocodeps
+      uses: crazy-max/ghaction-chocolatey@v3
+      with:
+        args: install libsndfile
+    - name: make
+      run: |
+        meson setup build
+        ninja -C build
+    - name: test
+      run: |
+        meson test -C build
+    - name: vcstatic
+      run: |
+        msbuild otherbuilds\rubberband-library.vcxproj /t:Build /p:Configuration=Release
+    - name: dotnet
+      run: |
+        msbuild dotnet\rubberband.sln "/t:Restore;Build"
+
+## (Commented out as cl not in path - to fix)
+#    - name: single
+#      run: |
+#        cl main\main.cpp single\RubberBandSingle.cpp .\src\ext\getopt\getopt.c src\ext\getopt\getopt_long.c "C:\Program Files\libsndfile\lib\sndfile.lib" /O2 /std:c++14 /D_USE_MATH_DEFINES /DNOMINMAX /EHs /I"C:\Program Files\libsndfile\include" /link /out:test_single.exe
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ An audio time-stretching and pitch-shifting library and utility program.

 Written by Chris Cannam, chris.cannam@breakfastquay.com.
 Published by Particular Programs Ltd t/a Breakfast Quay.
-Copyright 2007-2023 Particular Programs Ltd.
+Copyright 2007-2024 Particular Programs Ltd.

 Rubber Band is a library and utility program that permits changing the
 tempo and pitch of an audio recording independently of one another.
@@ -19,7 +19,7 @@ CI builds:

 * [![Build status](https://builds.sr.ht/~breakfastquay/rubberband.svg)](https://builds.sr.ht/~breakfastquay/rubberband?) (Linux)
 * [![Build Status](https://github.com/breakfastquay/rubberband/workflows/macOS%20and%20iOS%20CI/badge.svg)](https://github.com/breakfastquay/rubberband/actions?query=workflow%3A%22macOS+and+iOS+CI%22) (macOS, iOS)
-* [![Build Status](https://ci.appveyor.com/api/projects/status/hhhhpf718jwhpyf6?svg=true)](https://ci.appveyor.com/project/breakfastquay/rubberband) (Windows)
+* [![Build Status](https://github.com/breakfastquay/rubberband/workflows/Windows%20CI/badge.svg)](https://github.com/breakfastquay/rubberband/actions?query=workflow%3A%22Windows+CI%22) (Windows)


 ## Licence
--- a/ladspa-lv2/RubberBandPitchShifter.cpp
+++ b/ladspa-lv2/RubberBandPitchShifter.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/ladspa-lv2/RubberBandPitchShifter.h
+++ b/ladspa-lv2/RubberBandPitchShifter.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/ladspa-lv2/RubberBandR3PitchShifter.cpp
+++ b/ladspa-lv2/RubberBandR3PitchShifter.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/ladspa-lv2/RubberBandR3PitchShifter.h
+++ b/ladspa-lv2/RubberBandR3PitchShifter.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/ladspa-lv2/libmain-ladspa.cpp
+++ b/ladspa-lv2/libmain-ladspa.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/ladspa-lv2/libmain-lv2.cpp
+++ b/ladspa-lv2/libmain-lv2.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -241,7 +241,7 @@ int main(int argc, char **argv)
        cerr << endl;
 	cerr << "Rubber Band" << endl;
        cerr << "An audio time-stretching and pitch-shifting library and utility program." << endl;
-	cerr << "Copyright 2007-2023 Particular Programs Ltd." << endl;
+	cerr << "Copyright 2007-2024 Particular Programs Ltd." << endl;
        cerr << endl;
 	cerr << "   Usage: " << myName << " [options] <infile.wav> <outfile.wav>" << endl;
        cerr << endl;
--- a/rubberband/RubberBandLiveShifter.h
+++ b/rubberband/RubberBandLiveShifter.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/rubberband/RubberBandStretcher.h
+++ b/rubberband/RubberBandStretcher.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2022 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/rubberband/rubberband-c.h
+++ b/rubberband/rubberband-c.h
@@ -4,7 +4,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2022 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/single/RubberBandSingle.cpp
+++ b/single/RubberBandSingle.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/RubberBandLiveShifter.cpp
+++ b/src/RubberBandLiveShifter.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/RubberBandStretcher.cpp
+++ b/src/RubberBandStretcher.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Allocators.cpp
+++ b/src/common/Allocators.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Allocators.h
+++ b/src/common/Allocators.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/BQResampler.cpp
+++ b/src/common/BQResampler.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/BQResampler.h
+++ b/src/common/BQResampler.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/FFT.cpp
+++ b/src/common/FFT.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/FFT.h
+++ b/src/common/FFT.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/FixedVector.h
+++ b/src/common/FixedVector.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/HistogramFilter.h
+++ b/src/common/HistogramFilter.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Log.cpp
+++ b/src/common/Log.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Log.h
+++ b/src/common/Log.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/MovingMedian.h
+++ b/src/common/MovingMedian.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Profiler.cpp
+++ b/src/common/Profiler.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Profiler.h
+++ b/src/common/Profiler.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Resampler.cpp
+++ b/src/common/Resampler.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Resampler.h
+++ b/src/common/Resampler.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/RingBuffer.h
+++ b/src/common/RingBuffer.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -238,7 +238,8 @@ RingBuffer<T>::resized(int newSize) const
 {
    RingBuffer<T> *newBuffer = new RingBuffer<T>(newSize);
    
-    MBARRIER();
+    std::atomic_thread_fence(std::memory_order_seq_cst);
+    
    int w = m_writer;
    int r = m_reader;

@@ -464,7 +465,8 @@ RingBuffer<T>::write(const S *const R__ source, int n)
    w += n;
    while (w >= m_size) w -= m_size;

-    MBARRIER();
+    std::atomic_thread_fence(std::memory_order_seq_cst);
+    
    m_writer = w;

    return n;
@@ -498,7 +500,8 @@ RingBuffer<T>::zero(int n)
    w += n;
    while (w >= m_size) w -= m_size;

-    MBARRIER();
+    std::atomic_thread_fence(std::memory_order_seq_cst);
+    
    m_writer = w;

    return n;
--- a/src/common/SampleFilter.h
+++ b/src/common/SampleFilter.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Scavenger.h
+++ b/src/common/Scavenger.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/SingleThreadRingBuffer.h
+++ b/src/common/SingleThreadRingBuffer.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/StretchCalculator.cpp
+++ b/src/common/StretchCalculator.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/StretchCalculator.h
+++ b/src/common/StretchCalculator.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Thread.cpp
+++ b/src/common/Thread.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Thread.h
+++ b/src/common/Thread.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/VectorOps.h
+++ b/src/common/VectorOps.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/VectorOpsComplex.cpp
+++ b/src/common/VectorOpsComplex.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/VectorOpsComplex.h
+++ b/src/common/VectorOpsComplex.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/Window.h
+++ b/src/common/Window.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/mathmisc.cpp
+++ b/src/common/mathmisc.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/mathmisc.h
+++ b/src/common/mathmisc.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/common/sysutils.cpp
+++ b/src/common/sysutils.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -166,31 +166,6 @@ void gettimeofday(struct timeval *tv, void * /* tz */)

 #endif

-#ifdef _WIN32
-void system_memorybarrier()
-{
-#ifdef _MSC_VER
-    MemoryBarrier();
-#else /* (mingw) */
-    LONG Barrier = 0;
-    __asm__ __volatile__("xchgl %%eax,%0 "
-                         : "=r" (Barrier));
-#endif
-}
-#else /* !_WIN32 */
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-// Not required
-#else
-#include <pthread.h>
-void system_memorybarrier()
-{
-    pthread_mutex_t dummy = PTHREAD_MUTEX_INITIALIZER;
-    pthread_mutex_lock(&dummy);
-    pthread_mutex_unlock(&dummy);
-}
-#endif
-#endif
-
 }


--- a/src/common/sysutils.h
+++ b/src/common/sysutils.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -117,43 +117,5 @@ void gettimeofday(struct timeval *p, void *tz);

 } // end namespace

-// The following should be functions in the RubberBand namespace, really
-
-#ifdef _WIN32
-
-namespace RubberBand {
-extern void system_memorybarrier();
-}
-#define MBARRIER() RubberBand::system_memorybarrier()
-
-#else // !_WIN32
-
-#include <stdio.h>
-
-#ifdef __APPLE__
-#  if defined __MAC_10_12
-#    define MBARRIER() __sync_synchronize()
-#  else
-#    include <libkern/OSAtomic.h>
-#    define MBARRIER() OSMemoryBarrier()
-#  endif
-#else
-#  if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-#    define MBARRIER() __sync_synchronize()
-#  else
-namespace RubberBand {
-extern void system_memorybarrier();
-}
-#    define MBARRIER() ::RubberBand::system_memorybarrier()
-#  endif
-#endif
-
-#endif // !_WIN32
-
-#ifdef NO_THREADING
-#  undef MBARRIER
-#  define MBARRIER() 
-#endif // NO_THREADING
-
 #endif

--- a/src/faster/AudioCurveCalculator.cpp
+++ b/src/faster/AudioCurveCalculator.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/AudioCurveCalculator.h
+++ b/src/faster/AudioCurveCalculator.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/CompoundAudioCurve.cpp
+++ b/src/faster/CompoundAudioCurve.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/CompoundAudioCurve.h
+++ b/src/faster/CompoundAudioCurve.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/HighFrequencyAudioCurve.cpp
+++ b/src/faster/HighFrequencyAudioCurve.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/HighFrequencyAudioCurve.h
+++ b/src/faster/HighFrequencyAudioCurve.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/PercussiveAudioCurve.cpp
+++ b/src/faster/PercussiveAudioCurve.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/PercussiveAudioCurve.h
+++ b/src/faster/PercussiveAudioCurve.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/R2Stretcher.cpp
+++ b/src/faster/R2Stretcher.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/R2Stretcher.h
+++ b/src/faster/R2Stretcher.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/SilentAudioCurve.cpp
+++ b/src/faster/SilentAudioCurve.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/SilentAudioCurve.h
+++ b/src/faster/SilentAudioCurve.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/SincWindow.h
+++ b/src/faster/SincWindow.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/StretcherChannelData.cpp
+++ b/src/faster/StretcherChannelData.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/StretcherChannelData.h
+++ b/src/faster/StretcherChannelData.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/faster/StretcherProcess.cpp
+++ b/src/faster/StretcherProcess.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/BinClassifier.h
+++ b/src/finer/BinClassifier.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/BinSegmenter.h
+++ b/src/finer/BinSegmenter.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/Guide.h
+++ b/src/finer/Guide.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/Peak.h
+++ b/src/finer/Peak.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/PhaseAdvance.h
+++ b/src/finer/PhaseAdvance.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/R3LiveShifter.cpp
+++ b/src/finer/R3LiveShifter.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/R3LiveShifter.h
+++ b/src/finer/R3LiveShifter.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/R3Stretcher.cpp
+++ b/src/finer/R3Stretcher.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/finer/R3Stretcher.h
+++ b/src/finer/R3Stretcher.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/jni/RubberBandStretcherJNI.cpp
+++ b/src/jni/RubberBandStretcherJNI.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/rubberband-c.cpp
+++ b/src/rubberband-c.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestAllocators.cpp
+++ b/src/test/TestAllocators.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestBinClassifier.cpp
+++ b/src/test/TestBinClassifier.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestFFT.cpp
+++ b/src/test/TestFFT.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestLiveShifter.cpp
+++ b/src/test/TestLiveShifter.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestResampler.cpp
+++ b/src/test/TestResampler.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestSignalBits.cpp
+++ b/src/test/TestSignalBits.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestStretchCalculator.cpp
+++ b/src/test/TestStretchCalculator.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestStretcher.cpp
+++ b/src/test/TestStretcher.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestVectorOps.cpp
+++ b/src/test/TestVectorOps.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/TestVectorOpsComplex.cpp
+++ b/src/test/TestVectorOpsComplex.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/vamp/RubberBandVampPlugin.cpp
+++ b/vamp/RubberBandVampPlugin.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/vamp/RubberBandVampPlugin.h
+++ b/vamp/RubberBandVampPlugin.h
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
--- a/vamp/libmain.cpp
+++ b/vamp/libmain.cpp
@@ -3,7 +3,7 @@
 /*
    Rubber Band Library
    An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2023 Particular Programs Ltd.
+    Copyright 2007-2024 Particular Programs Ltd.

    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as