core: hid: Remove service callbacks on game close

2022-04-01 22:27:26 -06:00
1563 changed files with 26866 additions and 49047 deletions
@@ -3,12 +3,14 @@
 # Exit on error, rather than continuing with the rest of the script.
 set -e

+cd /yuzu
+
 ccache -s

 mkdir build || true && cd build
-cmake .. -GNinja -DDISPLAY_VERSION=$1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/clang -DCMAKE_CXX_COMPILER=/usr/lib/ccache/clang++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_INSTALL_PREFIX="/usr"
+cmake .. -DDISPLAY_VERSION=$1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/clang -DCMAKE_CXX_COMPILER=/usr/lib/ccache/clang++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_INSTALL_PREFIX="/usr"

-ninja
+make -j$(nproc)

 ccache -s

@@ -4,5 +4,5 @@ mkdir -p "ccache"  || true
 chmod a+x ./.ci/scripts/clang/docker.sh
 # the UID for the container yuzu user is 1027
 sudo chown -R 1027 ./
-docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/clang/docker.sh "$1"
+docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/clang/docker.sh $1
 sudo chown -R $UID ./
@@ -4,10 +4,8 @@
 cp license.txt "$DIR_NAME"
 cp README.md "$DIR_NAME"

-if [[ -z "${NO_SOURCE_PACK}" ]]; then
-  tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt
-  cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME"
-fi
+tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt
+cp "${REV_NAME}-source.tar.xz" "$DIR_NAME"

 tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$DIR_NAME"

@@ -3,5 +3,5 @@
 chmod a+x ./.ci/scripts/format/docker.sh
 # the UID for the container yuzu user is 1027
 sudo chown -R 1027 ./
-docker run -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh
+docker run -v $(pwd):/yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh
 sudo chown -R $UID ./
@@ -3,6 +3,8 @@
 # Exit on error, rather than continuing with the rest of the script.
 set -e

+cd /yuzu
+
 ccache -s

 mkdir build || true && cd build
@@ -17,16 +19,15 @@ cmake .. \
      -DENABLE_QT_TRANSLATION=ON \
      -DUSE_DISCORD_PRESENCE=ON \
      -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
-      -DYUZU_USE_BUNDLED_FFMPEG=ON \
-      -GNinja
+      -DYUZU_USE_BUNDLED_FFMPEG=ON

-ninja
+make -j$(nproc)

 ccache -s

 ctest -VV -C Release

-DESTDIR="$PWD/AppDir" ninja install
+make install DESTDIR=AppDir
 rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester

 # Download tools needed to build an AppImage
@@ -4,5 +4,5 @@ mkdir -p "ccache"  || true
 chmod a+x ./.ci/scripts/linux/docker.sh
 # the UID for the container yuzu user is 1027
 sudo chown -R 1027 ./
-docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh "$1"
+docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh $1
 sudo chown -R $UID ./
@@ -24,11 +24,6 @@ cd build
 wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage
 chmod 755 appimagetool-x86_64.AppImage

-# if FUSE is not available, then fallback to extract and run
-if ! ./appimagetool-x86_64.AppImage --version; then
-    export APPIMAGE_EXTRACT_AND_RUN=1
-fi
-
 if [ "${RELEASE_NAME}" = "mainline" ]; then
    # Generate update information if releasing to mainline
    ./appimagetool-x86_64.AppImage -u "gh-releases-zsync|yuzu-emu|yuzu-${RELEASE_NAME}|latest|yuzu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}"
@@ -1,33 +1,14 @@
 #!/bin/bash -ex

-set -e
+cd /yuzu

-#cd /yuzu
+ccache -s

-ccache -sv
+mkdir build || true && cd build
+cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON
+ninja

-mkdir -p "$HOME/.conan/profiles"
-wget -c "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/default" -O "$HOME/.conan/profiles/default"
-wget -c "https://github.com/yuzu-emu/build-environments/raw/master/linux-mingw/settings.yml" -O "$HOME/.conan/settings.yml"
-
-mkdir -p build && cd build
-export LDFLAGS="-fuse-ld=lld"
-# -femulated-tls required due to an incompatibility between GCC and Clang
-# TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate
-export CXXFLAGS="-femulated-tls"
-cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \
-    -DDISPLAY_VERSION="$1" \
-    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-    -DENABLE_QT_TRANSLATION=ON \
-    -DUSE_CCACHE=ON \
-    -DYUZU_USE_BUNDLED_SDL2=OFF \
-    -DYUZU_USE_EXTERNAL_SDL2=OFF \
-    -GNinja
-ninja yuzu yuzu-cmd
-
-ccache -sv
+ccache -s

 echo "Tests skipped"
 #ctest -VV -C Release
@@ -4,5 +4,5 @@ mkdir -p "ccache" || true
 chmod a+x ./.ci/scripts/windows/docker.sh
 # the UID for the container yuzu user is 1027
 sudo chown -R 1027 ./
-docker run -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh "$1"
+docker run -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh $1
 sudo chown -R $UID ./
@@ -8,7 +8,7 @@ steps:
  displayName: 'Install vulkan-sdk'
 - script: python -m pip install --upgrade pip conan
  displayName: 'Install conan'
- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 17 2022" -A x64 -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release .. && cd ..
+- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release .. && cd ..
  displayName: 'Configure CMake'
 - task: MSBuild@1
  displayName: 'Build'
@@ -47,7 +47,7 @@ stages:
    timeoutInMinutes: 120
    displayName: 'msvc'
    pool:
-      vmImage: windows-2022
+      vmImage: windows-2019
    steps:
    - template: ./templates/sync-source.yml
      parameters:
@@ -12,7 +12,7 @@ stages:
    timeoutInMinutes: 120
    displayName: 'windows-msvc'
    pool:
-      vmImage: windows-2022
+      vmImage: windows-2019
    steps:
    - template: ./templates/sync-source.yml
      parameters:
@@ -1,115 +0,0 @@
-name: 'yuzu verify'
-
-on:
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  format:
-    name: 'verify format'
-    runs-on: ubuntu-latest
-    container:
-      image: yuzuemu/build-environments:linux-clang-format
-      options: -u 1001
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: false
-      - name: 'Verify Formatting'
-        run: bash -ex ./.ci/scripts/format/script.sh
-  build:
-    name: 'test build'
-    needs: format
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - type: clang
-            image: linux-fresh
-          - type: linux
-            image: linux-fresh
-          - type: windows
-            image: linux-mingw
-    container:
-      image: yuzuemu/build-environments:${{ matrix.image }}
-      options: -u 1001
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Set up cache
-        uses: actions/cache@v2
-        id: ccache-restore
-        with:
-          path: ~/.ccache
-          key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.type }}-
-      - name: Create ccache directory
-        if: steps.ccache-restore.outputs.cache-hit != 'true'
-        run: mkdir -p ~/.ccache
-      - name: Build
-        run: ./.ci/scripts/${{ matrix.type }}/docker.sh
-        env:
-          ENABLE_COMPATIBILITY_REPORTING: "ON"
-      - name: Pack
-        run: ./.ci/scripts/${{ matrix.type }}/upload.sh
-        env:
-          NO_SOURCE_PACK: "YES"
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.type }}
-          path: artifacts/
-  build-msvc:
-    name: 'test build (windows, msvc)'
-    needs: format
-    runs-on: windows-2019
-    steps:
-      - name: Set up cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.buildcache
-          key: ${{ runner.os }}-msvc-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-msvc-
-      - name: Install dependencies
-        # due to how chocolatey works, only cmd.exe is supported here
-        shell: cmd
-        run: |
-          choco install vulkan-sdk wget
-          python -m pip install --upgrade pip conan
-          call refreshenv
-          wget https://github.com/mbitsnbites/buildcache/releases/download/v0.27.6/buildcache-windows.zip
-          7z x buildcache-windows.zip
-          copy buildcache\bin\buildcache.exe C:\ProgramData\chocolatey\bin
-          rmdir buildcache
-          echo %PATH% >> %GITHUB_PATH%
-      - name: Set up MSVC
-        uses: ilammy/msvc-dev-cmd@v1
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Configure
-        env:
-          CC: cl.exe
-          CXX: cl.exe
-        run: |
-          glslangValidator --version
-          mkdir build
-          cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release
-      - name: Build
-        run: cmake --build build
-      - name: Cache Summary
-        run: buildcache -s
-      - name: Pack
-        shell: pwsh
-        run: .\.ci\scripts\windows\upload.ps1
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: msvc
-          path: artifacts/
@@ -7,6 +7,9 @@
 [submodule "dynarmic"]
    path = externals/dynarmic
    url = https://github.com/MerryMage/dynarmic.git
+[submodule "soundtouch"]
+    path = externals/soundtouch
+    url = https://github.com/citra-emu/ext-soundtouch.git
 [submodule "libressl"]
    path = externals/libressl
    url = https://github.com/citra-emu/ext-libressl-portable.git
@@ -21,6 +21,8 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV

 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)

+option(YUZU_USE_BUNDLED_BOOST "Download bundled Boost" OFF)
+
 option(YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF)

 option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")
@@ -206,7 +208,9 @@ macro(yuzu_find_packages)
    unset(FN_FORCE_REQUIRED)
 endmacro()

-find_package(Boost 1.73.0 COMPONENTS context headers)
+if (NOT YUZU_USE_BUNDLED_BOOST)
+    find_package(Boost 1.73.0 CONFIG COMPONENTS context headers QUIET)
+endif()
 if (Boost_FOUND)
    set(Boost_LIBRARIES Boost::boost)
    # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it
@@ -217,14 +221,23 @@ if (Boost_FOUND)
    if (TARGET Boost::context)
        list(APPEND Boost_LIBRARIES Boost::context)
    endif()
-else()
-    message(STATUS "Boost 1.79.0 or newer not found, falling back to Conan")
-    list(APPEND CONAN_REQUIRED_LIBS "boost/1.79.0")
-endif()
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
+    message(STATUS "Boost 1.73.0 or newer not found, falling back to externals")
+    set(YUZU_USE_BUNDLED_BOOST ON CACHE BOOL "Download bundled Boost" FORCE)

-# boost:asio has functions that require AcceptEx et al
-if (MINGW)
-    find_library(MSWSOCK_LIBRARY mswsock REQUIRED)
+    # Use yuzu Boost binaries
+    set(Boost_EXT_NAME "boost_1_75_0")
+    set(Boost_PATH "${CMAKE_BINARY_DIR}/externals/${Boost_EXT_NAME}")
+    download_bundled_external("boost/" ${Boost_EXT_NAME} "")
+    set(Boost_USE_DEBUG_RUNTIME FALSE)
+    set(Boost_USE_STATIC_LIBS ON)
+    find_package(Boost 1.75.0 CONFIG REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH)
+    # Manually set the include dirs since the find_package sets it incorrectly
+    set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE)
+    include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
+else()
+    message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
+    list(APPEND CONAN_REQUIRED_LIBS "boost/1.78.0")
 endif()

 # Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS
@@ -410,11 +423,13 @@ if (CONAN_REQUIRED_LIBS)
    # Download conan.cmake automatically, you can also just copy the conan.cmake file
    if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
        message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
-        file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/release/0.18/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake")
+        # TODO: Use a tagged release. The latest tagged release does not support VS2022 as of this writing.
+        file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/43e385830ee35377dbd2dcbe8d5a9e750301ea00/conan.cmake"
+                        "${CMAKE_BINARY_DIR}/conan.cmake")
    endif()
    include(${CMAKE_BINARY_DIR}/conan.cmake)

-    conan_check(VERSION 1.45.0 REQUIRED)
+    conan_check(VERSION 1.41.0 REQUIRED)

    # Manually add iconv to fix a dep conflict between qt and sdl2
    # We don't need to add it through find_package or anything since the other two can find it just fine
@@ -627,14 +642,6 @@ add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
    -DBOOST_DATE_TIME_NO_LIB
    -DBOOST_REGEX_NO_LIB
 )
-# Adjustments for MSVC + Ninja
-if (MSVC AND CMAKE_GENERATOR STREQUAL "Ninja")
-    add_compile_options(
-        /wd4711 # function 'function' selected for automatic inline expansion
-        /wd4464 # relative include path contains '..'
-        /wd4820 # 'identifier1': '4' bytes padding added after data member 'identifier2'
-    )
-endif()

 enable_testing()
 add_subdirectory(externals)
@@ -652,18 +659,14 @@ endif()
 # =========================

 # Install freedesktop.org metadata files, following those specifications:
-# https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
-# https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
-# https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
-# https://www.freedesktop.org/software/appstream/docs/
+# http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
+# http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+# http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 if(ENABLE_QT AND UNIX AND NOT APPLE)
-    install(FILES "dist/org.yuzu_emu.yuzu.desktop"
-            DESTINATION "share/applications")
-    install(FILES "dist/yuzu.svg"
-            DESTINATION "share/icons/hicolor/scalable/apps"
-            RENAME "org.yuzu_emu.yuzu.svg")
-    install(FILES "dist/org.yuzu_emu.yuzu.xml"
-            DESTINATION "share/mime/packages")
-    install(FILES "dist/org.yuzu_emu.yuzu.metainfo.xml"
-            DESTINATION "share/metainfo")
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/yuzu.desktop"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/yuzu.svg"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/yuzu.xml"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages")
 endif()
@@ -2,6 +2,5 @@ function(copy_yuzu_FFmpeg_deps target_dir)
    include(WindowsCopyFiles)
    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
    file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
-    string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS)
    windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
 endfunction(copy_yuzu_FFmpeg_deps)
@@ -1,12 +0,0 @@
-# buildcache wrapper
-OPTION(USE_CCACHE "Use buildcache for compilation" OFF)
-IF(USE_CCACHE)
-    FIND_PROGRAM(CCACHE buildcache)
-    IF (CCACHE)
-        MESSAGE(STATUS "Using buildcache found in PATH")
-        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
-        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
-    ELSE(CCACHE)
-        MESSAGE(WARNING "USE_CCACHE enabled, but no buildcache executable found")
-    ENDIF(CCACHE)
-ENDIF(USE_CCACHE)
@@ -1,55 +0,0 @@
-set(MINGW_PREFIX                /usr/x86_64-w64-mingw32/)
-set(CMAKE_SYSTEM_NAME           Windows)
-set(CMAKE_SYSTEM_PROCESSOR      x86_64)
-
-set(CMAKE_FIND_ROOT_PATH        ${MINGW_PREFIX})
-set(SDL2_PATH                   ${MINGW_PREFIX})
-set(MINGW_TOOL_PREFIX           ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
-
-# Specify the cross compiler
-set(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}clang)
-set(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}clang++)
-set(CMAKE_RC_COMPILER           ${MINGW_TOOL_PREFIX}windres)
-set(CMAKE_C_COMPILER_AR         ${MINGW_TOOL_PREFIX}ar)
-set(CMAKE_CXX_COMPILER_AR       ${MINGW_TOOL_PREFIX}ar)
-set(CMAKE_C_COMPILER_RANLIB     ${MINGW_TOOL_PREFIX}ranlib)
-set(CMAKE_CXX_COMPILER_RANLIB   ${MINGW_TOOL_PREFIX}ranlib)
-
-# Mingw tools
-set(STRIP                       ${MINGW_TOOL_PREFIX}strip)
-set(WINDRES                     ${MINGW_TOOL_PREFIX}windres)
-set(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
-
-# ccache wrapper
-option(USE_CCACHE "Use ccache for compilation" OFF)
-if(USE_CCACHE)
-    find_program(CCACHE ccache)
-    if(CCACHE)
-        message(STATUS "Using ccache found in PATH")
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
-    else(CCACHE)
-        message(WARNING "USE_CCACHE enabled, but no ccache found")
-    endif(CCACHE)
-endif(USE_CCACHE)
-
-# Search for programs in the build host directories
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-
-
-# Echo modified cmake vars to screen for debugging purposes
-if(NOT DEFINED ENV{MINGW_DEBUG_INFO})
-        message("")
-        message("Custom cmake vars: (blank = system default)")
-        message("-----------------------------------------")
-        message("* CMAKE_C_COMPILER                     : ${CMAKE_C_COMPILER}")
-        message("* CMAKE_CXX_COMPILER                   : ${CMAKE_CXX_COMPILER}")
-        message("* CMAKE_RC_COMPILER                    : ${CMAKE_RC_COMPILER}")
-        message("* WINDRES                              : ${WINDRES}")
-        message("* ENV{PKG_CONFIG}                      : $ENV{PKG_CONFIG}")
-        message("* STRIP                                : ${STRIP}")
-        message("* USE_CCACHE                           : ${USE_CCACHE}")
-        message("")
-        # So that the debug info only appears once
-        set(ENV{MINGW_DEBUG_INFO} SHOWN)
-endif()
@@ -79,4 +79,4 @@ If you wish to support us a different way, please join our [Discord](https://dis

 yuzu is licensed under the GPLv3 (or any later version). Refer to the [license.txt](https://github.com/yuzu-emu/yuzu/blob/master/license.txt) file.

-The [Skyline-Emulator Team](https://github.com/skyline-emu/skyline) may choose to use the code from these contributors under the GPL-3.0-or-later OR MPL-2.0: [FernandoS27](https://github.com/FernandoS27), [lioncash](https://github.com/lioncash), [bunnei](https://github.com/bunnei), [ReinUsesLisp](https://github.com/ReinUsesLisp), [Morph1984](https://github.com/Morph1984), [ogniK5377](https://github.com/ogniK5377), [german77](https://github.com/german77), [ameerj](https://github.com/ameerj), [Kelebek1](https://github.com/Kelebek1) and [lat9nq](https://github.com/lat9nq)
+The [Skyline-Emulator Team](https://github.com/skyline-emu/skyline) is exempt from GPLv3 for the contributions from all these contributors [FernandoS27](https://github.com/FernandoS27), [lioncash](https://github.com/lioncash), [bunnei](https://github.com/bunnei), [ReinUsesLisp](https://github.com/ReinUsesLisp), [Morph1984](https://github.com/Morph1984), [ogniK5377](https://github.com/ogniK5377), [german77](https://github.com/german77), [ameerj](https://github.com/ameerj), [Kelebek1](https://github.com/Kelebek1) and [lat9nq](https://github.com/lat9nq). They may only use the code from these contributors under Mozilla Public License, version 2.0.
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>org.yuzu_emu.yuzu</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>yuzu</name>
-  <summary>Nintendo Switch emulator</summary>
-  <description>
-    <p>yuzu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.</p>
-    <p>The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.</p>
-    <p>For a full list of games yuzu support, please visit our Compatibility page.</p>
-    <p>Check out our website for the latest news on exciting features, monthly progress reports, and more!</p>
-  </description>
-  <categories>
-    <category>Game</category>
-    <category>Emulator</category>
-  </categories>
-  <keywords>
-    <keyword>switch</keyword>
-    <keyword>emulator</keyword>
-  </keywords>
-  <url type="homepage">https://yuzu-emu.org/</url>
-  <url type="bugtracker">https://github.com/yuzu-emu/yuzu/issues</url>
-  <url type="faq">https://yuzu-emu.org/wiki/faq/</url>
-  <url type="help">https://yuzu-emu.org/wiki/home/</url>
-  <url type="donation">https://yuzu-emu.org/donate/</url>
-  <url type="translate">https://www.transifex.com/projects/p/yuzu</url>
-  <url type="contact">https://community.citra-emu.org/</url>
-  <url type="vcs-browser">https://github.com/yuzu-emu/yuzu</url>
-  <url type="contribute">https://yuzu-emu.org/wiki/contributing/</url>
-  <launchable type="desktop-id">org.yuzu_emu.yuzu.desktop</launchable>
-  <provides>
-    <binary>yuzu</binary>
-    <binary>yuzu-cmd</binary>
-  </provides>
-  <supports>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <control>gamepad</control>
-  </supports>
-  <requires>
-    <memory>8192</memory>
-  </requires>
-  <recommends>
-    <memory>16384</memory>
-  </recommends>
-  <project_license>GPL-3.0-or-later</project_license>
-  <developer_name>yuzu Emulator Team</developer_name>
-  <content_rating type="oars-1.0"/>
-  <screenshots>
-    <screenshot type="default">https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png</screenshot>
-  </screenshots>
-</component>
@@ -58,19 +58,6 @@ QPushButton#GPUStatusBarButton:!checked {
    color: #109010;
 }

-QPushButton#DockingStatusBarButton {
-    min-width: 0px;
-    color: #000000;
-    border: 1px solid transparent;
-    background-color: transparent;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-}
-
-QPushButton#DockingStatusBarButton:hover {
-    border: 1px solid #76797C;
-}
-
 QPushButton#buttonRefreshDevices {
    min-width: 21px;
    min-height: 21px;
@@ -1304,19 +1304,6 @@ QPushButton#GPUStatusBarButton:!checked {
    color: #40dd40;
 }

-QPushButton#DockingStatusBarButton {
-    min-width: 0px;
-    color: #ffffff;
-    border: 1px solid transparent;
-    background-color: transparent;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-}
-
-QPushButton#DockingStatusBarButton:hover {
-    border: 1px solid #76797C;
-}
-
 QPushButton#buttonRefreshDevices {
    min-width: 23px;
    min-height: 23px;
@@ -2207,19 +2207,6 @@ QPushButton#GPUStatusBarButton:!checked {
  color: #40dd40;
 }

-QPushButton#DockingStatusBarButton {
-    min-width: 0px;
-    color: #ffffff;
-    border: 1px solid transparent;
-    background-color: transparent;
-    padding: 0px 3px 0px 3px;
-    text-align: center;
-}
-
-QPushButton#DockingStatusBarButton:hover {
-    border: 1px solid #76797C;
-}
-
 QPushButton#buttonRefreshDevices {
  min-width: 19px;
  min-height: 19px;
@@ -4,9 +4,9 @@ Type=Application
 Name=yuzu
 GenericName=Switch Emulator
 Comment=Nintendo Switch video game console emulator
-Icon=org.yuzu_emu.yuzu
+Icon=yuzu
 TryExec=yuzu
 Exec=yuzu %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
-Keywords=Nintendo;Switch;
+Keywords=Switch;Nintendo;
@@ -3,7 +3,7 @@
    <mime-type type="application/x-nx-nro">
        <comment>Nintendo Switch homebrew executable</comment>
        <acronym>NRO</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="yuzu"/>
        <glob pattern="*.nro"/>
        <magic><match value="NRO" type="string" offset="16"/></magic>
    </mime-type>
@@ -11,7 +11,7 @@
    <mime-type type="application/x-nx-nso">
        <comment>Nintendo Switch homebrew executable</comment>
        <acronym>NSO</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="yuzu"/>
        <glob pattern="*.nso"/>
        <magic><match value="NSO" type="string" offset="0"/></magic>
    </mime-type>
@@ -19,7 +19,7 @@
    <mime-type type="application/x-nx-nsp">
        <comment>Nintendo Switch Package</comment>
        <acronym>NSP</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="yuzu"/>
        <glob pattern="*.nsp"/>
        <magic><match value="PFS" type="string" offset="0"/></magic>
    </mime-type>
@@ -27,7 +27,7 @@
    <mime-type type="application/x-nx-xci">
        <comment>Nintendo Switch Card Image</comment>
        <acronym>XCI</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="yuzu"/>
        <glob pattern="*.xci"/>
    </mime-type>
-</mime-info>
+</mime-info>
@@ -40,11 +40,6 @@ target_include_directories(mbedtls PUBLIC ./mbedtls/include)
 add_library(microprofile INTERFACE)
 target_include_directories(microprofile INTERFACE ./microprofile)

-# GCC bugs
-if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND MINGW)
-    target_compile_options(microprofile INTERFACE "-Wno-array-bounds")
-endif()
-
 # libusb
 if (NOT LIBUSB_FOUND OR YUZU_USE_BUNDLED_LIBUSB)
    add_subdirectory(libusb)
@@ -73,6 +68,9 @@ if (YUZU_USE_EXTERNAL_SDL2)
    add_library(SDL2 ALIAS SDL2-static)
 endif()

+# SoundTouch
+add_subdirectory(soundtouch)
+
 # Cubeb
 if(ENABLE_CUBEB)
    set(BUILD_TESTS OFF CACHE BOOL "")
@@ -1246,7 +1246,7 @@ struct MicroProfileScopeLock
 {
    bool bUseLock;
    std::recursive_mutex& m;
-    MicroProfileScopeLock(std::recursive_mutex& m_) : bUseLock(g_bUseLock), m(m_)
+    MicroProfileScopeLock(std::recursive_mutex& m) : bUseLock(g_bUseLock), m(m)
    {
        if(bUseLock)
            m.lock();
@@ -213,8 +213,8 @@ struct MicroProfileCustom

 struct SOptionDesc
 {
-    SOptionDesc()=default;
-    SOptionDesc(uint8_t nSubType_, uint8_t nIndex_, const char* fmt, ...):nSubType(nSubType_), nIndex(nIndex_)
+    SOptionDesc(){}
+    SOptionDesc(uint8_t nSubType, uint8_t nIndex, const char* fmt, ...):nSubType(nSubType), nIndex(nIndex)
    {
        va_list args;
        va_start (args, fmt);
@@ -573,10 +573,10 @@ inline void MicroProfileToolTipMeta(MicroProfileStringArray* pToolTip)
                    }
                    else
                    {
-                        for(int k = 0; k < MICROPROFILE_META_MAX; ++k)
+                        for(int i = 0; i < MICROPROFILE_META_MAX; ++i)
                        {
-                            nMetaSumInclusive[k] += nMetaSum[k];
-                            nMetaSum[k] = 0;
+                            nMetaSumInclusive[i] += nMetaSum[i];
+                            nMetaSum[i] = 0;
                        }
                    }
                    break;
@@ -708,10 +708,10 @@ inline void MicroProfileDrawFloatTooltip(uint32_t nX, uint32_t nY, uint32_t nTok

    if(UI.nMouseLeftMod)
    {
-        int nToolTipIndex = (g_MicroProfileUI.LockedToolTipFront + MICROPROFILE_TOOLTIP_MAX_LOCKED - 1) % MICROPROFILE_TOOLTIP_MAX_LOCKED;
-        g_MicroProfileUI.nLockedToolTipColor[nToolTipIndex] = S.TimerInfo[nTimerId].nColor;
-        MicroProfileStringArrayCopy(&g_MicroProfileUI.LockedToolTips[nToolTipIndex], &ToolTip);
-        g_MicroProfileUI.LockedToolTipFront = nToolTipIndex;
+        int nIndex = (g_MicroProfileUI.LockedToolTipFront + MICROPROFILE_TOOLTIP_MAX_LOCKED - 1) % MICROPROFILE_TOOLTIP_MAX_LOCKED;
+        g_MicroProfileUI.nLockedToolTipColor[nIndex] = S.TimerInfo[nTimerId].nColor;
+        MicroProfileStringArrayCopy(&g_MicroProfileUI.LockedToolTips[nIndex], &ToolTip);
+        g_MicroProfileUI.LockedToolTipFront = nIndex;

    }
 }
@@ -917,8 +917,9 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
        float fStart = floor(fMsBase*fRcpStep) * fStep;
        for(float f = fStart; f < fMsEnd; )
        {
+            float fStart = f;
            float fNext = f + fStep;
-            MicroProfileDrawBox(((f-fMsBase) * fMsToScreen), nBaseY, (fNext-fMsBase) * fMsToScreen+1, nBaseY + nHeight, UI.nOpacityBackground | g_nMicroProfileBackColors[nColorIndex++ & 1]);
+            MicroProfileDrawBox(((fStart-fMsBase) * fMsToScreen), nBaseY, (fNext-fMsBase) * fMsToScreen+1, nBaseY + nHeight, UI.nOpacityBackground | g_nMicroProfileBackColors[nColorIndex++ & 1]);
            f = fNext;
        }
    }
@@ -1115,9 +1116,9 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int

                        nMaxStackDepth = MicroProfileMax(nMaxStackDepth, nStackPos);
                        float fMsStart = fToMs * MicroProfileLogTickDifference(nBaseTicks, nTickStart);
-                        float fMsEnd2 = fToMs * MicroProfileLogTickDifference(nBaseTicks, nTickEnd);
+                        float fMsEnd = fToMs * MicroProfileLogTickDifference(nBaseTicks, nTickEnd);
                        float fXStart = fMsStart * fMsToScreen;
-                        float fXEnd = fMsEnd2 * fMsToScreen;
+                        float fXEnd = fMsEnd * fMsToScreen;
                        float fYStart = (float)(nY + nStackPos * nYDelta);
                        float fYEnd = fYStart + (MICROPROFILE_DETAILED_BAR_HEIGHT);
                        float fXDist = MicroProfileMax(fXStart - fMouseX, fMouseX - fXEnd);
@@ -1268,22 +1269,22 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
        if(UI.nRangeBegin != UI.nRangeEnd)
        {
            float fMsStart = fToMsCpu * MicroProfileLogTickDifference(nBaseTicksCpu, UI.nRangeBegin);
-            float fMsEnd3 = fToMsCpu * MicroProfileLogTickDifference(nBaseTicksCpu, UI.nRangeEnd);
+            float fMsEnd = fToMsCpu * MicroProfileLogTickDifference(nBaseTicksCpu, UI.nRangeEnd);
            float fXStart = fMsStart * fMsToScreen;
-            float fXEnd = fMsEnd3 * fMsToScreen;
+            float fXEnd = fMsEnd * fMsToScreen;
            MicroProfileDrawBox(fXStart, nBaseY, fXEnd, nHeight, MICROPROFILE_FRAME_COLOR_HIGHTLIGHT, MicroProfileBoxTypeFlat);
            MicroProfileDrawLineVertical(fXStart, nBaseY, nHeight, MICROPROFILE_FRAME_COLOR_HIGHTLIGHT | 0x44000000);
            MicroProfileDrawLineVertical(fXEnd, nBaseY, nHeight, MICROPROFILE_FRAME_COLOR_HIGHTLIGHT | 0x44000000);

            fMsStart += fDetailedOffset;
-            fMsEnd3 += fDetailedOffset;
+            fMsEnd += fDetailedOffset;
            char sBuffer[32];
            uint32_t nLenStart = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsStart);
            float fStartTextWidth = (float)((1+MICROPROFILE_TEXT_WIDTH) * nLenStart);
            float fStartTextX = fXStart - fStartTextWidth - 2;
            MicroProfileDrawBox(fStartTextX, nBaseY, fStartTextX + fStartTextWidth + 2, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
            MicroProfileDrawText(fStartTextX+1, nBaseY, UINT32_MAX, sBuffer, nLenStart);
-            uint32_t nLenEnd = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsEnd3);
+            uint32_t nLenEnd = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsEnd);
            MicroProfileDrawBox(fXEnd+1, nBaseY, fXEnd+1+(1+MICROPROFILE_TEXT_WIDTH) * nLenEnd + 3, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
            MicroProfileDrawText(fXEnd+2, nBaseY+1, UINT32_MAX, sBuffer, nLenEnd);

@@ -1296,9 +1297,9 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
        if(UI.nRangeBeginGpu != UI.nRangeEndGpu)
        {
            float fMsStart = fToMsGpu * MicroProfileLogTickDifference(nBaseTicksGpu, UI.nRangeBeginGpu);
-            float fMsEnd4 = fToMsGpu * MicroProfileLogTickDifference(nBaseTicksGpu, UI.nRangeEndGpu);
+            float fMsEnd = fToMsGpu * MicroProfileLogTickDifference(nBaseTicksGpu, UI.nRangeEndGpu);
            float fXStart = fMsStart * fMsToScreen;
-            float fXEnd = fMsEnd4 * fMsToScreen;
+            float fXEnd = fMsEnd * fMsToScreen;
            MicroProfileDrawBox(fXStart, nBaseY, fXEnd, nHeight, MICROPROFILE_FRAME_COLOR_HIGHTLIGHT_GPU, MicroProfileBoxTypeFlat);
            MicroProfileDrawLineVertical(fXStart, nBaseY, nHeight, MICROPROFILE_FRAME_COLOR_HIGHTLIGHT_GPU | 0x44000000);
            MicroProfileDrawLineVertical(fXEnd, nBaseY, nHeight, MICROPROFILE_FRAME_COLOR_HIGHTLIGHT_GPU | 0x44000000);
@@ -1306,14 +1307,14 @@ inline void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int
            nBaseY += MICROPROFILE_TEXT_HEIGHT+1;

            fMsStart += fDetailedOffset;
-            fMsEnd4 += fDetailedOffset;
+            fMsEnd += fDetailedOffset;
            char sBuffer[32];
            uint32_t nLenStart = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsStart);
            float fStartTextWidth = (float)((1+MICROPROFILE_TEXT_WIDTH) * nLenStart);
            float fStartTextX = fXStart - fStartTextWidth - 2;
            MicroProfileDrawBox(fStartTextX, nBaseY, fStartTextX + fStartTextWidth + 2, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
            MicroProfileDrawText(fStartTextX+1, nBaseY, UINT32_MAX, sBuffer, nLenStart);
-            uint32_t nLenEnd = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsEnd4);
+            uint32_t nLenEnd = snprintf(sBuffer, sizeof(sBuffer)-1, "%.2fms", fMsEnd);
            MicroProfileDrawBox(fXEnd+1, nBaseY, fXEnd+1+(1+MICROPROFILE_TEXT_WIDTH) * nLenEnd + 3, MICROPROFILE_TEXT_HEIGHT + 2 + nBaseY, 0x33000000, MicroProfileBoxTypeFlat);
            MicroProfileDrawText(fXEnd+2, nBaseY+1, UINT32_MAX, sBuffer, nLenEnd);
        }
@@ -1715,8 +1716,8 @@ bool MicroProfileDrawGraph(uint32_t nScreenWidth, uint32_t nScreenHeight)
        uint32_t nTextCount = 0;
        uint32_t nGraphIndex = (S.nGraphPut + MICROPROFILE_GRAPH_HISTORY - int(MICROPROFILE_GRAPH_HISTORY*(1.f - fMouseXPrc))) % MICROPROFILE_GRAPH_HISTORY;

-        uint32_t nMouseX = UI.nMouseX;
-        uint32_t nMouseY = UI.nMouseY + 20;
+        uint32_t nX = UI.nMouseX;
+        uint32_t nY = UI.nMouseY + 20;

        for(uint32_t i = 0; i < MICROPROFILE_MAX_GRAPHS; ++i)
        {
@@ -1735,7 +1736,7 @@ bool MicroProfileDrawGraph(uint32_t nScreenWidth, uint32_t nScreenHeight)
        }
        if(nTextCount)
        {
-            MicroProfileDrawFloatWindow(nMouseX, nMouseY, Strings.ppStrings, Strings.nNumStrings, 0, pColors);
+            MicroProfileDrawFloatWindow(nX, nY, Strings.ppStrings, Strings.nNumStrings, 0, pColors);
        }

        if(UI.nMouseRight)
@@ -2320,8 +2321,8 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
    uint32_t    nMenuX[MICROPROFILE_MENU_MAX] = {0};
    uint32_t nNumMenuItems = 0;

-    int nMPTextLen = snprintf(buffer, 127, "MicroProfile");
-    MicroProfileDrawText(nX, nY, UINT32_MAX, buffer, nMPTextLen);
+    int nLen = snprintf(buffer, 127, "MicroProfile");
+    MicroProfileDrawText(nX, nY, UINT32_MAX, buffer, nLen);
    nX += (sizeof("MicroProfile")+2) * (MICROPROFILE_TEXT_WIDTH+1);
    pMenuText[nNumMenuItems++] = "Mode";
    pMenuText[nNumMenuItems++] = "Groups";
@@ -2437,16 +2438,16 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
        int nNumLines = 0;
        bool bSelected = false;
        const char* pString = CB(nNumLines, &bSelected);
-        uint32_t nTextWidth = 0, nTextHeight = 0;
+        uint32_t nWidth = 0, nHeight = 0;
        while(pString)
        {
-            nTextWidth = MicroProfileMax<int>(nTextWidth, (int)strlen(pString));
+            nWidth = MicroProfileMax<int>(nWidth, (int)strlen(pString));
            nNumLines++;
            pString = CB(nNumLines, &bSelected);
        }
-        nTextWidth = (2+nTextWidth) * (MICROPROFILE_TEXT_WIDTH+1);
-        nTextHeight = nNumLines * (MICROPROFILE_TEXT_HEIGHT+1);
-        if(UI.nMouseY <= nY + nTextHeight+0 && UI.nMouseY >= nY-0 && UI.nMouseX <= nX + nTextWidth + 0 && UI.nMouseX >= nX - 0)
+        nWidth = (2+nWidth) * (MICROPROFILE_TEXT_WIDTH+1);
+        nHeight = nNumLines * (MICROPROFILE_TEXT_HEIGHT+1);
+        if(UI.nMouseY <= nY + nHeight+0 && UI.nMouseY >= nY-0 && UI.nMouseX <= nX + nWidth + 0 && UI.nMouseX >= nX - 0)
        {
            UI.nActiveMenu = nMenu;
        }
@@ -2454,21 +2455,21 @@ inline void MicroProfileDrawMenu(uint32_t nWidth, uint32_t nHeight)
        {
            UI.nActiveMenu = UINT32_MAX;
        }
-        MicroProfileDrawBox(nX, nY, nX + nTextWidth, nY + nTextHeight, 0xff000000|g_nMicroProfileBackColors[1]);
+        MicroProfileDrawBox(nX, nY, nX + nWidth, nY + nHeight, 0xff000000|g_nMicroProfileBackColors[1]);
        for(int i = 0; i < nNumLines; ++i)
        {
-            bool bSelected2 = false;
-            const char* pString2 = CB(i, &bSelected2);
+            bool bSelected = false;
+            const char* pString = CB(i, &bSelected);
            if(UI.nMouseY >= nY && UI.nMouseY < nY + MICROPROFILE_TEXT_HEIGHT + 1)
            {
                if(UI.nMouseLeft || UI.nMouseRight)
                {
                    CBClick[nMenu](i);
                }
-                MicroProfileDrawBox(nX, nY, nX + nTextWidth, nY + MICROPROFILE_TEXT_HEIGHT + 1, 0xff888888);
+                MicroProfileDrawBox(nX, nY, nX + nWidth, nY + MICROPROFILE_TEXT_HEIGHT + 1, 0xff888888);
            }
-            int nTextLen = snprintf(buffer, SBUF_SIZE-1, "%c %s", bSelected2 ? '*' : ' ' ,pString2);
-            MicroProfileDrawText(nX, nY, UINT32_MAX, buffer, nTextLen);
+            int nLen = snprintf(buffer, SBUF_SIZE-1, "%c %s", bSelected ? '*' : ' ' ,pString);
+            MicroProfileDrawText(nX, nY, UINT32_MAX, buffer, nLen);
            nY += MICROPROFILE_TEXT_HEIGHT+1;
        }
    }
@@ -2604,7 +2605,7 @@ inline void MicroProfileDrawCustom(uint32_t nWidth, uint32_t nHeight)
            for(uint32_t i = 0; i < nCount; ++i)
            {
                nOffsetY += (1+MICROPROFILE_TEXT_HEIGHT);
-                nWidth = MicroProfileMin(nMaxWidth, (uint32_t)(nMaxWidth * pMs[i] * fRcpReference));
+                uint32_t nWidth = MicroProfileMin(nMaxWidth, (uint32_t)(nMaxWidth * pMs[i] * fRcpReference));
                MicroProfileDrawBox(nMaxOffsetX, nOffsetY, nMaxOffsetX+nWidth, nOffsetY+MICROPROFILE_TEXT_HEIGHT, pColors[i]|0xff000000);
            }
        }
@@ -36,6 +36,7 @@ if (MSVC)
    # /GT                 - Supports fiber safety for data allocated using static thread-local storage
    add_compile_options(
        /MP
+        /Zi
        /Zm200
        /Zo
        /permissive-
@@ -64,27 +65,14 @@ if (MSVC)
        /we4305 # 'context': truncation from 'type1' to 'type2'
        /we4388 # 'expression': signed/unsigned mismatch
        /we4389 # 'operator': signed/unsigned mismatch
-        /we4456 # Declaration of 'identifier' hides previous local declaration
-        /we4457 # Declaration of 'identifier' hides function parameter
-        /we4458 # Declaration of 'identifier' hides class member
-        /we4459 # Declaration of 'identifier' hides global declaration
-        /we4505 # 'function': unreferenced local function has been removed
        /we4547 # 'operator': operator before comma has no effect; expected operator with side-effect
        /we4549 # 'operator1': operator before comma has no effect; did you intend 'operator2'?
        /we4555 # Expression has no effect; expected expression with side-effect
        /we4715 # 'function': not all control paths return a value
        /we4834 # Discarding return value of function with 'nodiscard' attribute
        /we5038 # data member 'member1' will be initialized after data member 'member2'
-        /we5245 # 'function': unreferenced function with internal linkage has been removed
    )

-    if (USE_CCACHE)
-    # when caching, we need to use /Z7 to downgrade debug info to use an older but more cachable format
-        add_compile_options(/Z7)
-    else()
-        add_compile_options(/Zi)
-    endif()
-
    if (ARCHITECTURE_x86_64)
        add_compile_options(/QIntel-jcc-erratum)
    endif()
@@ -102,7 +90,6 @@ else()
        -Werror=missing-declarations
        -Werror=missing-field-initializers
        -Werror=reorder
-        -Werror=shadow
        -Werror=sign-compare
        -Werror=switch
        -Werror=uninitialized
@@ -116,6 +103,12 @@ else()
        -Wno-unused-parameter
    )

+    # TODO: Remove when we update to a GCC compiler that enables this
+    #       by default (i.e. GCC 10 or newer).
+    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+        add_compile_options(-fconcepts)
+    endif()
+
    if (ARCHITECTURE_x86_64)
        add_compile_options("-mcx16")
    endif()
@@ -36,6 +36,8 @@ add_library(audio_core STATIC
    splitter_context.h
    stream.cpp
    stream.h
+    time_stretch.cpp
+    time_stretch.h
    voice_context.cpp
    voice_context.h

@@ -49,6 +51,9 @@ if (NOT MSVC)
    target_compile_options(audio_core PRIVATE
        -Werror=conversion
        -Werror=ignored-qualifiers
+        -Werror=shadow
+        -Werror=unused-parameter
+        -Werror=unused-variable

        $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-parameter>
        $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-variable>
@@ -58,6 +63,7 @@ if (NOT MSVC)
 endif()

 target_link_libraries(audio_core PUBLIC common core)
+target_link_libraries(audio_core PRIVATE SoundTouch)

 if(ENABLE_CUBEB)
    target_link_libraries(audio_core PRIVATE cubeb)
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #define _USE_MATH_DEFINES

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #define _USE_MATH_DEFINES

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include "audio_core/audio_out.h"
 #include "audio_core/sink.h"
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,8 +1,8 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <limits>
-#include <optional>
 #include <vector>

 #include "audio_core/audio_out.h"
@@ -89,12 +89,9 @@ AudioRenderer::AudioRenderer(Core::Timing::CoreTiming& core_timing_, Core::Memor
    stream = audio_out->OpenStream(
        core_timing, params.sample_rate, AudioCommon::STREAM_NUM_CHANNELS,
        fmt::format("AudioRenderer-Instance{}", instance_number), std::move(release_callback));
-    process_event =
-        Core::Timing::CreateEvent(fmt::format("AudioRenderer-Instance{}-Process", instance_number),
-                                  [this](std::uintptr_t, s64, std::chrono::nanoseconds) {
-                                      ReleaseAndQueueBuffers();
-                                      return std::nullopt;
-                                  });
+    process_event = Core::Timing::CreateEvent(
+        fmt::format("AudioRenderer-Instance{}-Process", instance_number),
+        [this](std::uintptr_t, std::chrono::nanoseconds) { ReleaseAndQueueBuffers(); });
    for (s32 i = 0; i < NUM_BUFFERS; ++i) {
        QueueMixedBuffer(i);
    }
@@ -102,13 +99,13 @@ AudioRenderer::AudioRenderer(Core::Timing::CoreTiming& core_timing_, Core::Memor

 AudioRenderer::~AudioRenderer() = default;

-Result AudioRenderer::Start() {
+ResultCode AudioRenderer::Start() {
    audio_out->StartStream(stream);
    ReleaseAndQueueBuffers();
    return ResultSuccess;
 }

-Result AudioRenderer::Stop() {
+ResultCode AudioRenderer::Stop() {
    audio_out->StopStream(stream);
    return ResultSuccess;
 }
@@ -129,8 +126,8 @@ Stream::State AudioRenderer::GetStreamState() const {
    return stream->GetState();
 }

-Result AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_params,
-                                          std::vector<u8>& output_params) {
+ResultCode AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_params,
+                                              std::vector<u8>& output_params) {
    std::scoped_lock lock{mutex};
    InfoUpdater info_updater{input_params, output_params, behavior_info};

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -43,10 +44,10 @@ public:
                  Stream::ReleaseCallback&& release_callback, std::size_t instance_number);
    ~AudioRenderer();

-    [[nodiscard]] Result UpdateAudioRenderer(const std::vector<u8>& input_params,
-                                             std::vector<u8>& output_params);
-    [[nodiscard]] Result Start();
-    [[nodiscard]] Result Stop();
+    [[nodiscard]] ResultCode UpdateAudioRenderer(const std::vector<u8>& input_params,
+                                                 std::vector<u8>& output_params);
+    [[nodiscard]] ResultCode Start();
+    [[nodiscard]] ResultCode Stop();
    void QueueMixedBuffer(Buffer::Tag tag);
    void ReleaseAndQueueBuffers();
    [[nodiscard]] u32 GetSampleRate() const;
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <cstring>
 #include "audio_core/behavior_info.h"
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <algorithm>

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <algorithm>
 #include <cmath>
@@ -129,17 +130,17 @@ s32 ToS32(float sample) {
    return static_cast<s32>(rescaled_sample);
 }

-constexpr std::array<u8, 20> REVERB_TAP_INDEX_1CH{0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_1CH{0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                                           0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

-constexpr std::array<u8, 20> REVERB_TAP_INDEX_2CH{0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
-                                                  1, 1, 1, 0, 0, 0, 0, 1, 1, 1};
+constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_2CH{0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
+                                                           1, 1, 1, 0, 0, 0, 0, 1, 1, 1};

-constexpr std::array<u8, 20> REVERB_TAP_INDEX_4CH{0, 0, 0, 1, 1, 1, 1, 2, 2, 2,
-                                                  1, 1, 1, 0, 0, 0, 0, 3, 3, 3};
+constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_4CH{0, 0, 0, 1, 1, 1, 1, 2, 2, 2,
+                                                           1, 1, 1, 0, 0, 0, 0, 3, 3, 3};

-constexpr std::array<u8, 20> REVERB_TAP_INDEX_6CH{4, 0, 0, 1, 1, 1, 1, 2, 2, 2,
-                                                  1, 1, 1, 0, 0, 0, 0, 3, 3, 3};
+constexpr std::array<std::size_t, 20> REVERB_TAP_INDEX_6CH{4, 0, 0, 1, 1, 1, 1, 2, 2, 2,
+                                                           1, 1, 1, 0, 0, 0, 0, 3, 3, 3};

 template <std::size_t CHANNEL_COUNT>
 void ApplyReverbGeneric(
@@ -429,7 +430,7 @@ void CommandGenerator::GenerateDataSourceCommand(ServerVoiceInfo& voice_info, Vo
                                  in_params.node_id);
            break;
        default:
-            ASSERT_MSG(false, "Unimplemented sample format={}", in_params.sample_format);
+            UNREACHABLE_MSG("Unimplemented sample format={}", in_params.sample_format);
        }
    }
 }
@@ -1312,7 +1313,7 @@ void CommandGenerator::DecodeFromWaveBuffers(ServerVoiceInfo& voice_info, std::s
                                samples_to_read - samples_read, channel, temp_mix_offset);
                break;
            default:
-                ASSERT_MSG(false, "Unimplemented sample format={}", in_params.sample_format);
+                UNREACHABLE_MSG("Unimplemented sample format={}", in_params.sample_format);
            }

            temp_mix_offset += samples_decoded;
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -10,8 +11,8 @@

 namespace AudioCommon {
 namespace Audren {
-constexpr Result ERR_INVALID_PARAMETERS{ErrorModule::Audio, 41};
-constexpr Result ERR_SPLITTER_SORT_FAILED{ErrorModule::Audio, 43};
+constexpr ResultCode ERR_INVALID_PARAMETERS{ErrorModule::Audio, 41};
+constexpr ResultCode ERR_SPLITTER_SORT_FAILED{ErrorModule::Audio, 43};
 } // namespace Audren

 constexpr u8 BASE_REVISION = '0';
@@ -1,11 +1,13 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <algorithm>
 #include <atomic>
 #include <cstring>
 #include "audio_core/cubeb_sink.h"
 #include "audio_core/stream.h"
+#include "audio_core/time_stretch.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/ring_buffer.h"
@@ -21,7 +23,8 @@ class CubebSinkStream final : public SinkStream {
 public:
    CubebSinkStream(cubeb* ctx_, u32 sample_rate, u32 num_channels_, cubeb_devid output_device,
                    const std::string& name)
-        : ctx{ctx_}, num_channels{std::min(num_channels_, 6u)} {
+        : ctx{ctx_}, num_channels{std::min(num_channels_, 6u)}, time_stretch{sample_rate,
+                                                                             num_channels} {

        cubeb_stream_params params{};
        params.rate = sample_rate;
@@ -128,6 +131,7 @@ private:
    Common::RingBuffer<s16, 0x10000> queue;
    std::array<s16, 2> last_frame{};
    std::atomic<bool> should_flush{};
+    TimeStretcher time_stretch;

    static long DataCallback(cubeb_stream* stream, void* user_data, const void* input_buffer,
                             void* output_buffer, long num_frames);
@@ -201,7 +205,25 @@ long CubebSinkStream::DataCallback([[maybe_unused]] cubeb_stream* stream, void*

    const std::size_t num_channels = impl->GetNumChannels();
    const std::size_t samples_to_write = num_channels * num_frames;
-    const std::size_t samples_written = impl->queue.Pop(buffer, samples_to_write);
+    std::size_t samples_written;
+
+    /*
+    if (Settings::values.enable_audio_stretching.GetValue()) {
+        const std::vector<s16> in{impl->queue.Pop()};
+        const std::size_t num_in{in.size() / num_channels};
+        s16* const out{reinterpret_cast<s16*>(buffer)};
+        const std::size_t out_frames =
+            impl->time_stretch.Process(in.data(), num_in, out, num_frames);
+        samples_written = out_frames * num_channels;
+
+        if (impl->should_flush) {
+            impl->time_stretch.Flush();
+            impl->should_flush = false;
+        }
+    } else {
+        samples_written = impl->queue.Pop(buffer, samples_to_write);
+    }*/
+    samples_written = impl->queue.Pop(buffer, samples_to_write);

    if (samples_written >= num_channels) {
        std::memcpy(&impl->last_frame[0], buffer + (samples_written - num_channels) * sizeof(s16),
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <cstring>
 #include "audio_core/delay_line.h"
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <algorithm>
 #include "audio_core/effect_context.h"
@@ -50,7 +51,7 @@ EffectBase* EffectContext::RetargetEffect(std::size_t i, EffectType effect) {
        effects[i] = std::make_unique<EffectBiquadFilter>();
        break;
    default:
-        ASSERT_MSG(false, "Unimplemented effect {}", effect);
+        UNREACHABLE_MSG("Unimplemented effect {}", effect);
        effects[i] = std::make_unique<EffectStubbed>();
    }
    return GetInfo(i);
@@ -104,7 +105,7 @@ void EffectI3dl2Reverb::Update(EffectInfo::InParams& in_params) {
    auto& params = GetParams();
    const auto* reverb_params = reinterpret_cast<I3dl2ReverbParams*>(in_params.raw.data());
    if (!ValidChannelCountForEffect(reverb_params->max_channels)) {
-        ASSERT_MSG(false, "Invalid reverb max channel count {}", reverb_params->max_channels);
+        UNREACHABLE_MSG("Invalid reverb max channel count {}", reverb_params->max_channels);
        return;
    }

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include "audio_core/behavior_info.h"
 #include "audio_core/effect_context.h"
@@ -285,8 +286,9 @@ bool InfoUpdater::UpdateSplitterInfo(SplitterContext& splitter_context) {
    return true;
 }

-Result InfoUpdater::UpdateMixes(MixContext& mix_context, std::size_t mix_buffer_count,
-                                SplitterContext& splitter_context, EffectContext& effect_context) {
+ResultCode InfoUpdater::UpdateMixes(MixContext& mix_context, std::size_t mix_buffer_count,
+                                    SplitterContext& splitter_context,
+                                    EffectContext& effect_context) {
    std::vector<MixInfo::InParams> mix_in_params;

    if (!behavior_info.IsMixInParameterDirtyOnlyUpdateSupported()) {
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -32,8 +33,8 @@ public:
                      VAddr audio_codec_dsp_addr);
    bool UpdateEffects(EffectContext& effect_context, bool is_active);
    bool UpdateSplitterInfo(SplitterContext& splitter_context);
-    Result UpdateMixes(MixContext& mix_context, std::size_t mix_buffer_count,
-                       SplitterContext& splitter_context, EffectContext& effect_context);
+    ResultCode UpdateMixes(MixContext& mix_context, std::size_t mix_buffer_count,
+                           SplitterContext& splitter_context, EffectContext& effect_context);
    bool UpdateSinks(SinkContext& sink_context);
    bool UpdatePerformanceBuffer();
    bool UpdateErrorInfo(BehaviorInfo& in_behavior_info);
@@ -1,6 +1,7 @@

-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include "audio_core/memory_pool.h"
 #include "common/logging/log.h"
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <algorithm>

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,11 +1,13 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <algorithm>
 #include <atomic>
 #include <cstring>
 #include "audio_core/sdl2_sink.h"
 #include "audio_core/stream.h"
+#include "audio_core/time_stretch.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 //#include "common/settings.h"
@@ -25,7 +27,7 @@ namespace AudioCore {
 class SDLSinkStream final : public SinkStream {
 public:
    SDLSinkStream(u32 sample_rate, u32 num_channels_, const std::string& output_device)
-        : num_channels{std::min(num_channels_, 6u)} {
+        : num_channels{std::min(num_channels_, 6u)}, time_stretch{sample_rate, num_channels} {

        SDL_AudioSpec spec;
        spec.freq = sample_rate;
@@ -114,6 +116,7 @@ private:
    SDL_AudioDeviceID dev = 0;
    u32 num_channels{};
    std::atomic<bool> should_flush{};
+    TimeStretcher time_stretch;
 };

 SDLSink::SDLSink(std::string_view target_device_name) {
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include "audio_core/sink_context.h"

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #include <algorithm>
 #include <memory>
@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

@@ -1,5 +1,6 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2018 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.

 #pragma once

--- a/Show More
+++ b/Show More