Update sdl_driver.cpp

.ci/scripts/linux/docker.sh

@@ -33,14 +33,16 @@ DESTDIR="$PWD/AppDir" ninja install
 rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester
 
 # Download tools needed to build an AppImage
-wget -nc https://raw.githubusercontent.com/yuzu-emu/ext-linux-bin/main/gcc/deploy-linux.sh
-wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh
+wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-x86_64.AppImage
+wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-plugin-qt-x86_64.AppImage
+wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/AppRun-patched-x86_64
 wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so
 # Set executable bit
 chmod 755 \
-    deploy-linux.sh \
-    AppRun.sh \
+    AppRun-patched-x86_64 \
     exec-x86_64.so \
+    linuxdeploy-x86_64.AppImage \
+    linuxdeploy-plugin-qt-x86_64.AppImage
 
 # Workaround for https://github.com/AppImage/AppImageKit/issues/828
 export APPIMAGE_EXTRACT_AND_RUN=1
@@ -50,7 +52,7 @@ mkdir -p AppDir/usr/optional/libstdc++
 mkdir -p AppDir/usr/optional/libgcc_s
 
 # Deploy yuzu's needed dependencies
-DEPLOY_QT=1 ./deploy-linux.sh AppDir/usr/bin/yuzu AppDir
+./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt
 
 # Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems
 find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print
@@ -58,6 +60,6 @@ find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print
 # Workaround for building yuzu with GCC 10 but also trying to distribute it to Ubuntu 18.04 et al.
 # See https://github.com/darealshinji/AppImageKit-checkrt
 cp exec-x86_64.so AppDir/usr/optional/exec.so
-cp AppRun.sh AppDir/AppRun
+cp AppRun-patched-x86_64 AppDir/AppRun
 cp --dereference /usr/lib/x86_64-linux-gnu/libstdc++.so.6 AppDir/usr/optional/libstdc++/libstdc++.so.6
 cp --dereference /lib/x86_64-linux-gnu/libgcc_s.so.1 AppDir/usr/optional/libgcc_s/libgcc_s.so.1

.ci/scripts/linux/upload.sh

@@ -5,24 +5,21 @@
 
 . .ci/scripts/common/pre-upload.sh
 
-APPIMAGE_NAME="yuzu-${RELEASE_NAME}-${GITDATE}-${GITREV}.AppImage"
-BASE_NAME="yuzu-linux"
-REV_NAME="${BASE_NAME}-${GITDATE}-${GITREV}"
+APPIMAGE_NAME="yuzu-${GITDATE}-${GITREV}.AppImage"
+REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
 ARCHIVE_NAME="${REV_NAME}.tar.xz"
 COMPRESSION_FLAGS="-cJvf"
 
-if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
-    DIR_NAME="${BASE_NAME}-${RELEASE_NAME}"
+if [ "${RELEASE_NAME}" = "mainline" ]; then
+    DIR_NAME="${REV_NAME}"
 else
-    DIR_NAME="${REV_NAME}-${RELEASE_NAME}"
+    DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
 fi
 
 mkdir "$DIR_NAME"
 
 cp build/bin/yuzu-cmd "$DIR_NAME"
-if [ "${RELEASE_NAME}" != "early-access" ] && [ "${RELEASE_NAME}" != "mainline" ]; then
-    cp build/bin/yuzu "$DIR_NAME"
-fi
+cp build/bin/yuzu "$DIR_NAME"
 
 # Build an AppImage
 cd build
@@ -35,11 +32,6 @@ if ! ./appimagetool-x86_64.AppImage --version; then
     export APPIMAGE_EXTRACT_AND_RUN=1
 fi
 
-# Don't let AppImageLauncher ask to integrate EA
-if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
-    echo "X-AppImage-Integrate=false" >> AppDir/org.yuzu_emu.yuzu.desktop
-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}"
@@ -54,9 +46,4 @@ if [ -f "build/${APPIMAGE_NAME}.zsync" ]; then
     cp "build/${APPIMAGE_NAME}.zsync" "${ARTIFACTS_DIR}/"
 fi
 
-# Copy the AppImage to the general release directory and remove git revision info
-if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
-    cp "build/${APPIMAGE_NAME}" "${DIR_NAME}/yuzu-${RELEASE_NAME}.AppImage"
-fi
-
 . .ci/scripts/common/post-upload.sh

.ci/scripts/transifex/docker.sh

@@ -3,6 +3,15 @@
 # SPDX-FileCopyrightText: 2021 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+# Setup RC file for tx
+cat << EOF > ~/.transifexrc
+[https://www.transifex.com]
+hostname = https://www.transifex.com
+username = api
+password = $TRANSIFEX_API_TOKEN
+EOF
+
+
 set -x
 
 echo -e "\e[1m\e[33mBuild tools information:\e[0m"
@@ -10,6 +19,9 @@ cmake --version
 gcc -v
 tx --version
 
+# vcpkg needs these: curl zip unzip tar, have tar
+apt-get install -y curl zip unzip
+
 mkdir build && cd build
 cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_VCPKG=ON
 make translation

.ci/scripts/windows/docker.sh

@@ -10,14 +10,17 @@ set -e
 ccache -sv
 
 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/MinGWCross.cmake" \
+    -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \
     -DDISPLAY_VERSION="$1" \
     -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
     -DENABLE_QT_TRANSLATION=ON \
     -DUSE_CCACHE=ON \
-    -DYUZU_CRASH_DUMPS=ON \
     -DYUZU_USE_BUNDLED_SDL2=OFF \
     -DYUZU_USE_EXTERNAL_SDL2=OFF \
     -DYUZU_TESTS=OFF \

.ci/scripts/windows/upload.ps1

@@ -65,8 +65,8 @@ if ("$env:GITHUB_ACTIONS" -eq "true") {
     # None of the other GHA builds are including source, so commenting out today
     #Copy-Item $MSVC_SOURCE_TARXZ -Destination "artifacts"
 
-    # Debugging symbols
-    cp .\build\bin\yuzu*.pdb .\artifacts\
+    # Are debug symbols important?
+    # cp .\build\bin\yuzu*.pdb .\pdb\
 
     # Write out a tag BUILD_TAG to environment for the Upload step
     # We're getting ${{ github.event.number }} as $env:PR_NUMBER"

.ci/templates/build-msvc.yml

@@ -9,7 +9,7 @@ parameters:
 steps:
 - script: choco install vulkan-sdk
   displayName: 'Install vulkan-sdk'
-- 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 -DYUZU_CRASH_DUMPS=ON .. && cd ..
+- 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 ..
   displayName: 'Configure CMake'
 - task: MSBuild@1
   displayName: 'Build'

.ci/yuzu-patreon-step2.yml

@@ -11,30 +11,9 @@ stages:
 - stage: build
   displayName: 'build'
   jobs:
-  - job: linux
+  - job: build
     timeoutInMinutes: 120
-    displayName: 'linux'
-    pool:
-      vmImage: ubuntu-latest
-    strategy:
-      maxParallel: 10
-      matrix:
-        linux:
-          BuildSuffix: 'linux'
-          ScriptFolder: 'linux'
-    steps:
-    - template: ./templates/sync-source.yml
-      parameters:
-        artifactSource: $(parameters.artifactSource)
-        needSubmodules: 'true'
-    - template: ./templates/build-single.yml
-      parameters:
-        artifactSource: 'false'
-        cache: $(parameters.cache)
-        version: $(DisplayVersion)
-  - job: msvc
-    timeoutInMinutes: 120
-    displayName: 'windows'
+    displayName: 'windows-msvc'
     pool:
       vmImage: windows-2022
     steps:

.github/workflows/ci.yml

@@ -19,11 +19,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-          fetch-depth: 0
+          fetch-depth: 0   
       - name: Update Translation
         run: ./.ci/scripts/transifex/docker.sh
         env:
-          TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }}
+          TRANSIFEX_API_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }}
 
   reuse:
     runs-on: ubuntu-latest

.github/workflows/verify.yml

@@ -104,7 +104,7 @@ jobs:
         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 -DGIT_BRANCH=pr-verify -DYUZU_CRASH_DUMPS=ON
+          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 -DGIT_BRANCH=pr-verify
       - name: Build
         run: cmake --build build
       - name: Cache Summary

.gitignore

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # Build directory
-[Bb]uild*/
+[Bb]uild/
 doc-build/
 
 # Generated source files

.reuse/dep5

@@ -6,7 +6,6 @@ Files: dist/english_plurals/*
        dist/icons/controller/*.png
        dist/icons/overlay/*.png
        dist/languages/*
-       dist/qt_themes/*/icons/48x48/sd_card.png
        dist/qt_themes/*/icons/index.theme
        dist/qt_themes/default/style.qss
 Copyright: yuzu Emulator Project
@@ -52,8 +51,6 @@ Files: dist/qt_themes/colorful/icons/16x16/lock.png
        dist/qt_themes/colorful/icons/48x48/chip.png
        dist/qt_themes/colorful/icons/48x48/folder.png
        dist/qt_themes/colorful_dark/icons/16x16/lock.png
-       dist/qt_themes/colorful/icons/16x16/info.png
-       dist/qt_themes/colorful/icons/16x16/sync.png
 Copyright: Icons8
 License: MIT
 Comment: https://github.com/icons8/flat-color-icons
@@ -69,9 +66,11 @@ Files: dist/qt_themes/*/icons/48x48/no_avatar.png
 Copyright: Ionic (http://ionic.io/)
 License: MIT
 
-Files: dist/qt_themes/colorful/icons/48x48/star.png
-       dist/qt_themes/colorful/icons/16x16/checked.png
-       dist/qt_themes/colorful/icons/16x16/failed.png
+
+Files: dist/qt_themes/*/icons/48x48/sd_card.png
+       dist/qt_themes/colorful/icons/48x48/star.png
+       dist/qt_themes/default/icons/16x16/checked.png
+       dist/qt_themes/default/icons/16x16/failed.png
 Copyright: SVG Repo
 License: CC0-1.0
 

CMakeLists.txt

@@ -38,8 +38,6 @@ option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON)
 
 option(YUZU_TESTS "Compile tests" ON)
 
-CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF)
-
 option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}")
 
 option(YUZU_CHECK_SUBMODULES "Check if submodules are present" ON)
@@ -48,9 +46,6 @@ if (YUZU_USE_BUNDLED_VCPKG)
     if (YUZU_TESTS)
         list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests")
     endif()
-    if (YUZU_CRASH_DUMPS)
-        list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp")
-    endif()
 
     include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake)
 elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "")
@@ -252,7 +247,7 @@ if(ENABLE_QT)
             endif()
 
             # Check for headers
-            find_package(PkgConfig REQUIRED)
+            Include(FindPkgConfig REQUIRED)
             pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0)
             if (NOT QT_DEP_GLU_FOUND)
                 message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not found. \
@@ -386,7 +381,7 @@ endif()
 
 # Ensure libusb is properly configured (based on dolphin libusb include)
 if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB)
-    find_package(PkgConfig)
+    include(FindPkgConfig)
     if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
         pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24)
     else()
@@ -410,7 +405,7 @@ set(FFmpeg_COMPONENTS
     swscale)
 
 if (UNIX AND NOT APPLE)
-    find_package(PkgConfig REQUIRED)
+    Include(FindPkgConfig REQUIRED)
     pkg_check_modules(LIBVA libva)
 endif()
 if (NOT YUZU_USE_BUNDLED_FFMPEG)
@@ -452,13 +447,6 @@ elseif (WIN32)
         # PSAPI is the Process Status API
         set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
     endif()
-
-    if (YUZU_CRASH_DUMPS)
-        find_library(DBGHELP_LIBRARY dbghelp)
-        if ("${DBGHELP_LIBRARY}" STREQUAL "DBGHELP_LIBRARY-NOTFOUND")
-            message(FATAL_ERROR "YUZU_CRASH_DUMPS enabled but dbghelp library not found")
-        endif()
-    endif()
 elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
     set(PLATFORM_LIBRARIES rt)
 endif()
@@ -541,9 +529,9 @@ add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
 # Adjustments for MSVC + Ninja
 if (MSVC AND CMAKE_GENERATOR STREQUAL "Ninja")
     add_compile_options(
-        /wd4464 # relative include path contains '..'
         /wd4711 # function 'function' selected for automatic inline expansion
-        /wd4820 # 'bytes' bytes padding added after construct 'member_name'
+        /wd4464 # relative include path contains '..'
+        /wd4820 # 'identifier1': '4' bytes padding added after data member 'identifier2'
     )
 endif()
 

CMakeModules/GenerateSCMRev.cmake

@@ -7,6 +7,11 @@ function(get_timestamp _var)
     set(${_var} "${timestamp}" PARENT_SCOPE)
 endfunction()
 
+list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules")
+
+# Find the package here with the known path so that the GetGit commands can find it as well
+find_package(Git QUIET PATHS "${GIT_EXECUTABLE}")
+
 # generate git/build information
 include(GetGitRevisionDescription)
 if(NOT GIT_REF_SPEC)
@@ -24,7 +29,6 @@ get_timestamp(BUILD_DATE)
 # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well
 set(REPO_NAME "")
 set(BUILD_VERSION "0")
-set(BUILD_ID ${DISPLAY_VERSION})
 if (BUILD_REPOSITORY)
   # regex capture the string nightly or canary into CMAKE_MATCH_1
   string(REGEX MATCH "yuzu-emu/yuzu-?(.*)" OUTVAR ${BUILD_REPOSITORY})
@@ -53,4 +57,6 @@ if (BUILD_REPOSITORY)
   endif()
 endif()
 
-configure_file(scm_rev.cpp.in scm_rev.cpp @ONLY)
+# The variable SRC_DIR must be passed into the script
+# (since it uses the current build directory for all values of CMAKE_*_DIR)
+configure_file("${SRC_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY)

dist/languages/.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:yuzu-emulator:p:yuzu:r:emulator]
+[yuzu.emulator]
 file_filter = <lang>.ts
 source_file = en.ts
 source_lang = en

dist/languages/README.md

@@ -1,3 +1 @@
-This directory stores translation patches (TS files) for yuzu Qt frontend. This directory is linked with [yuzu project on transifex](https://www.transifex.com/yuzu-emulator/yuzu), so you can update the translation by executing `tx pull -t -a`. If you want to contribute to the translation, please go the transifex link and submit your translation there. This directory on the main repo will be synchronized with transifex periodically.
-
-Do not directly open PRs on github to modify the translation.
+This directory stores translation patches (TS files) for yuzu Qt frontend. This directory is linked with [yuzu project on transifex](https://www.transifex.com/yuzu-emulator/yuzu), so you can update the translation by executing `tx pull -a`. If you want to contribute to the translation, please go the transifex link and submit your translation there. This directory on the main repo will be synchronized with transifex periodically. Do not directly open PRs on github to modify the translation.

dist/qt_themes/colorful/icons/index.theme

@@ -1,6 +1,7 @@
 [Icon Theme]
 Name=colorful
 Comment=Colorful theme
+Inherits=default
 Directories=16x16,48x48,256x256
  
 [16x16]

dist/qt_themes/colorful/style.qrc

@@ -6,20 +6,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
 <RCC>
     <qresource prefix="icons/colorful">
         <file alias="index.theme">icons/index.theme</file>
-        <file alias="16x16/checked.png">icons/16x16/checked.png</file>
         <file alias="16x16/connected.png">icons/16x16/connected.png</file>
         <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
         <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
-        <file alias="16x16/failed.png">icons/16x16/failed.png</file>
-        <file alias="16x16/info.png">icons/16x16/info.png</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/sync.png">icons/16x16/sync.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>
         <file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
-        <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
         <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>

dist/qt_themes/colorful_dark/style.qrc

@@ -5,9 +5,19 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 <RCC>
     <qresource prefix="icons/colorful_dark">
+        <file alias="16x16/connected.png">../colorful/icons/16x16/connected.png</file>
+        <file alias="16x16/connected_notification.png">../colorful/icons/16x16/connected_notification.png</file>
+        <file alias="16x16/disconnected.png">../colorful/icons/16x16/disconnected.png</file>
         <file alias="index.theme">icons/index.theme</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
         <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
+        <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
+        <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
+        <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>
+        <file alias="48x48/no_avatar.png">../qdarkstyle/icons/48x48/no_avatar.png</file>
+        <file alias="48x48/list-add.png">../colorful/icons/48x48/list-add.png</file>
+        <file alias="48x48/sd_card.png">../colorful/icons/48x48/sd_card.png</file>
+        <file alias="256x256/plus_folder.png">../colorful/icons/256x256/plus_folder.png</file>
     </qresource>
 
     <qresource prefix="qss_icons">

dist/qt_themes/default/default.qrc

@@ -5,20 +5,23 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 <RCC>
     <qresource prefix="icons/default">
-        <!-- "colorful" is now the default theme, add new icons there -->
         <file alias="index.theme">icons/index.theme</file>
-        <file alias="16x16/connected.png">icons/16x16/connected.png</file>
-        <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
-        <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
+        <file alias="16x16/checked.png">icons/16x16/checked.png</file>
+        <file alias="16x16/failed.png">icons/16x16/failed.png</file>
         <file alias="16x16/lock.png">icons/16x16/lock.png</file>
+        <file alias="16x16/connected.png">icons/16x16/connected.png</file>
+        <file alias="16x16/disconnected.png">icons/16x16/disconnected.png</file>
+        <file alias="16x16/connected_notification.png">icons/16x16/connected_notification.png</file>
+        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
         <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
         <file alias="48x48/chip.png">icons/48x48/chip.png</file>
         <file alias="48x48/folder.png">icons/48x48/folder.png</file>
+        <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
         <file alias="48x48/list-add.png">icons/48x48/list-add.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
         <file alias="48x48/star.png">icons/48x48/star.png</file>
-        <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
         <file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
+        <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
     </qresource>
     <qresource prefix="default">
         <file>style.qss</file>

dist/qt_themes/default/icons/index.theme

@@ -1,7 +1,6 @@
 [Icon Theme]
 Name=default
 Comment=default theme
-Inherits=colorful
 Directories=16x16,48x48,256x256
  
 [16x16]
@@ -11,4 +10,4 @@ Size=16
 Size=48
  
 [256x256]
-Size=256
+Size=256

dist/qt_themes/qdarkstyle/icons/index.theme

@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=qdarkstyle
 Comment=dark theme
-Inherits=colorful
+Inherits=default
 Directories=16x16,48x48,256x256
  
 [16x16]
@@ -11,4 +11,4 @@ Size=16
 Size=48
 
 [256x256]
-Size=256
+Size=256

dist/qt_themes/qdarkstyle_midnight_blue/icons/index.theme

@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=qdarkstyle_midnight_blue
 Comment=dark theme
-Inherits=colorful
+Inherits=default
 Directories=16x16,48x48,256x256
 
 [16x16]

externals/CMakeLists.txt

@@ -16,6 +16,7 @@ endif()
 
 # Dynarmic
 if (ARCHITECTURE_x86_64)
+    set(DYNARMIC_TESTS OFF)
     set(DYNARMIC_NO_BUNDLED_FMT ON)
     set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
     add_subdirectory(dynarmic)

externals/ffmpeg/CMakeLists.txt

@@ -43,7 +43,7 @@ if (NOT WIN32)
             CACHE PATH "Paths to FFmpeg libraries" FORCE)
     endforeach()
 
-    find_package(PkgConfig REQUIRED)
+    Include(FindPkgConfig REQUIRED)
     pkg_check_modules(LIBVA libva)
     pkg_check_modules(CUDA cuda)
     pkg_check_modules(FFNVCODEC ffnvcodec)

externals/libusb/CMakeLists.txt

@@ -108,7 +108,7 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE)
     target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}")
 
     if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-        find_package(PkgConfig)
+        Include(FindPkgConfig)
         pkg_check_modules(LIBUDEV REQUIRED libudev)
 
         if (LIBUDEV_FOUND)

src/CMakeLists.txt

@@ -58,11 +58,13 @@ if (MSVC)
 
         # Warnings
         /W3
-        /WX
-
+        /we4018 # 'expression': signed/unsigned mismatch
         /we4062 # Enumerator 'identifier' in a switch of enum 'enumeration' is not handled
+        /we4101 # 'identifier': unreferenced local variable
         /we4189 # 'identifier': local variable is initialized but not referenced
         /we4265 # 'class': class has virtual functions, but destructor is not virtual
+        /we4267 # 'var': conversion from 'size_t' to 'type', possible loss of data
+        /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
@@ -73,13 +75,10 @@ if (MSVC)
         /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
-        /we4826 # Conversion from 'type1' to 'type2' is sign-extended. This may cause unexpected runtime behavior.
+        /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'
-        /we5233 # explicit lambda capture 'identifier' is not used
         /we5245 # 'function': unreferenced function with internal linkage has been removed
-
-        /wd4100 # 'identifier': unreferenced formal parameter
-        /wd4324 # 'struct_name': structure was padded due to __declspec(align())
     )
 
     if (USE_CCACHE)
@@ -100,23 +99,28 @@ if (MSVC)
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
 else()
     add_compile_options(
-        -Werror=all
-        -Werror=extra
+        -Wall
+        -Werror=array-bounds
+        -Werror=implicit-fallthrough
         -Werror=missing-declarations
+        -Werror=missing-field-initializers
+        -Werror=reorder
         -Werror=shadow
-        -Werror=unused
-
+        -Werror=sign-compare
+        -Werror=switch
+        -Werror=uninitialized
+        -Werror=unused-function
+        -Werror=unused-result
+        -Werror=unused-variable
+        -Wextra
+        -Wmissing-declarations
         -Wno-attributes
         -Wno-invalid-offsetof
         -Wno-unused-parameter
-
-        $<$<CXX_COMPILER_ID:Clang>:-Wno-braced-scalar-init>
-        $<$<CXX_COMPILER_ID:Clang>:-Wno-unused-private-field>
     )
 
     if (ARCHITECTURE_x86_64)
         add_compile_options("-mcx16")
-        add_compile_options("-fwrapv")
     endif()
 
     if (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)

src/audio_core/CMakeLists.txt

@@ -194,7 +194,6 @@ add_library(audio_core STATIC
     sink/sink.h
     sink/sink_details.cpp
     sink/sink_details.h
-    sink/sink_stream.cpp
     sink/sink_stream.h
 )
 
@@ -206,11 +205,20 @@ if (MSVC)
         /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data
         /we4245 # 'conversion': conversion from 'type1' to 'type2', signed/unsigned mismatch
         /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
-        /we4800 # Implicit conversion from 'type' to bool. Possible information loss
+        /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
     )
 else()
     target_compile_options(audio_core PRIVATE
         -Werror=conversion
+        -Werror=ignored-qualifiers
+        -Werror=shadow
+        -Werror=unused-variable
+
+        $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-parameter>
+        $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-variable>
 
         -Wno-sign-conversion
     )

src/audio_core/audio_core.cpp

@@ -8,7 +8,7 @@
 
 namespace AudioCore {
 
-AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>()} {
+AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>(system)} {
     CreateSinks();
     // Must be created after the sinks
     adsp = std::make_unique<AudioRenderer::ADSP::ADSP>(system, *output_sink);
@@ -47,12 +47,22 @@ AudioRenderer::ADSP::ADSP& AudioCore::GetADSP() {
     return *adsp;
 }
 
-void AudioCore::SetNVDECActive(bool active) {
-    nvdec_active = active;
+void AudioCore::PauseSinks(const bool pausing) const {
+    if (pausing) {
+        output_sink->PauseStreams();
+        input_sink->PauseStreams();
+    } else {
+        output_sink->UnpauseStreams();
+        input_sink->UnpauseStreams();
+    }
 }
 
-bool AudioCore::IsNVDECActive() const {
-    return nvdec_active;
+u32 AudioCore::GetStreamQueue() const {
+    return estimated_queue.load();
+}
+
+void AudioCore::SetStreamQueue(u32 size) {
+    estimated_queue.store(size);
 }
 
 } // namespace AudioCore

src/audio_core/audio_core.h

@@ -17,7 +17,7 @@ namespace AudioCore {
 
 class AudioManager;
 /**
- * Main audio class, stored inside the core, and holding the audio manager, all sinks, and the ADSP.
+ * Main audio class, sotred inside the core, and holding the audio manager, all sinks, and the ADSP.
  */
 class AudioCore {
 public:
@@ -58,16 +58,26 @@ public:
     AudioRenderer::ADSP::ADSP& GetADSP();
 
     /**
-     * Toggle NVDEC state, used to avoid stall in playback.
+     * Pause the sink. Called from the core.
      *
-     * @param active - Set true if nvdec is active, otherwise false.
+     * @param pausing - Is this pause due to an actual pause, or shutdown?
+     *                  Unfortunately, shutdown also pauses streams, which can cause issues.
      */
-    void SetNVDECActive(bool active);
+    void PauseSinks(bool pausing) const;
 
     /**
-     * Get NVDEC state.
+     * Get the size of the current stream queue.
+     *
+     * @return Current stream queue size.
      */
-    bool IsNVDECActive() const;
+    u32 GetStreamQueue() const;
+
+    /**
+     * Get the size of the current stream queue.
+     *
+     * @param size - New stream size.
+     */
+    void SetStreamQueue(u32 size);
 
 private:
     /**
@@ -83,8 +93,8 @@ private:
     std::unique_ptr<Sink::Sink> input_sink;
     /// The ADSP in the sysmodule
     std::unique_ptr<AudioRenderer::ADSP::ADSP> adsp;
-    /// Is NVDec currently active?
-    bool nvdec_active{false};
+    /// Current size of the stream queue
+    std::atomic<u32> estimated_queue{0};
 };
 
 } // namespace AudioCore

src/audio_core/audio_event.h

@@ -14,7 +14,7 @@ namespace AudioCore {
  * Responsible for the input/output events, set by the stream backend when buffers are consumed, and
  * waited on by the audio manager. These callbacks signal the game's events to keep the audio buffer
  * recycling going.
- * In a real Switch this is not a separate class, and exists entirely within the audio manager.
+ * In a real Switch this is not a seprate class, and exists entirely within the audio manager.
  * On the Switch it's implemented more simply through a MultiWaitEventHolder, where it can
  * wait on multiple events at once, and the events are not needed by the backend.
  */
@@ -81,7 +81,7 @@ public:
     void ClearEvents();
 
 private:
-    /// Lock, used by the audio manager
+    /// Lock, used bythe audio manager
     std::mutex event_lock;
     /// Array of events, one per system type (see Type), last event is used to terminate
     std::array<std::atomic<bool>, 4> events_signalled;

src/audio_core/audio_in_manager.cpp

@@ -82,7 +82,7 @@ u32 Manager::GetDeviceNames(std::vector<AudioRenderer::AudioDevice::AudioDeviceN
 
     auto input_devices{Sink::GetDeviceListForSink(Settings::values.sink_id.GetValue(), true)};
     if (input_devices.size() > 1) {
-        names.emplace_back("Uac");
+        names.push_back(AudioRenderer::AudioDevice::AudioDeviceName("Uac"));
         return 1;
     }
     return 0;

src/audio_core/audio_in_manager.h

@@ -59,10 +59,9 @@ public:
     /**
      * Get a list of audio in device names.
      *
-     * @param names     - Output container to write names to.
-     * @param max_count - Maximum number of device names to write. Unused
+     * @oaram names     - Output container to write names to.
+     * @param max_count - Maximum numebr of deivce names to write. Unused
      * @param filter    - Should the list be filtered? Unused.
-     *
      * @return Number of names written.
      */
     u32 GetDeviceNames(std::vector<AudioRenderer::AudioDevice::AudioDeviceName>& names,

src/audio_core/audio_manager.cpp

@@ -1,13 +1,14 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "audio_core/audio_in_manager.h"
 #include "audio_core/audio_manager.h"
+#include "audio_core/audio_out_manager.h"
 #include "core/core.h"
-#include "core/hle/service/audio/errors.h"
 
 namespace AudioCore {
 
-AudioManager::AudioManager() {
+AudioManager::AudioManager(Core::System& system_) : system{system_} {
     thread = std::jthread([this]() { ThreadFunc(); });
 }
 
@@ -26,7 +27,7 @@ Result AudioManager::SetOutManager(BufferEventFunc buffer_func) {
 
     const auto index{events.GetManagerIndex(Event::Type::AudioOutManager)};
     if (buffer_events[index] == nullptr) {
-        buffer_events[index] = std::move(buffer_func);
+        buffer_events[index] = buffer_func;
         needs_update = true;
         events.SetAudioEvent(Event::Type::AudioOutManager, true);
     }
@@ -42,7 +43,7 @@ Result AudioManager::SetInManager(BufferEventFunc buffer_func) {
 
     const auto index{events.GetManagerIndex(Event::Type::AudioInManager)};
     if (buffer_events[index] == nullptr) {
-        buffer_events[index] = std::move(buffer_func);
+        buffer_events[index] = buffer_func;
         needs_update = true;
         events.SetAudioEvent(Event::Type::AudioInManager, true);
     }
@@ -59,21 +60,19 @@ void AudioManager::ThreadFunc() {
     running = true;
 
     while (running) {
-        const auto timed_out{events.Wait(l, std::chrono::seconds(2))};
+        auto timed_out{events.Wait(l, std::chrono::seconds(2))};
 
         if (events.CheckAudioEventSet(Event::Type::Max)) {
             break;
         }
 
         for (size_t i = 0; i < buffer_events.size(); i++) {
-            const auto event_type = static_cast<Event::Type>(i);
-
-            if (events.CheckAudioEventSet(event_type) || timed_out) {
+            if (events.CheckAudioEventSet(Event::Type(i)) || timed_out) {
                 if (buffer_events[i]) {
                     buffer_events[i]();
                 }
             }
-            events.SetAudioEvent(event_type, false);
+            events.SetAudioEvent(Event::Type(i), false);
         }
     }
 }

src/audio_core/audio_manager.h

@@ -10,11 +10,22 @@
 #include <thread>
 
 #include "audio_core/audio_event.h"
+#include "core/hle/service/audio/errors.h"
 
-union Result;
+namespace Core {
+class System;
+}
 
 namespace AudioCore {
 
+namespace AudioOut {
+class Manager;
+}
+
+namespace AudioIn {
+class Manager;
+}
+
 /**
  * The AudioManager's main purpose is to wait for buffer events for the audio in and out managers,
  * and call an associated callback to release buffers.
@@ -32,7 +43,7 @@ class AudioManager {
     using BufferEventFunc = std::function<void()>;
 
 public:
-    explicit AudioManager();
+    explicit AudioManager(Core::System& system);
 
     /**
      * Shutdown the audio manager.
@@ -65,10 +76,14 @@ public:
 
 private:
     /**
-     * Main thread, waiting on a manager signal and calling the registered function.
+     * Main thread, waiting on a manager signal and calling the registered fucntion.
      */
     void ThreadFunc();
 
+    /// Core system
+    Core::System& system;
+    /// Have sessions started palying?
+    bool sessions_started{};
     /// Is the main thread running?
     std::atomic<bool> running{};
     /// Unused

src/audio_core/audio_out_manager.cpp

@@ -74,7 +74,7 @@ void Manager::BufferReleaseAndRegister() {
 
 u32 Manager::GetAudioOutDeviceNames(
     std::vector<AudioRenderer::AudioDevice::AudioDeviceName>& names) const {
-    names.emplace_back("DeviceOut");
+    names.push_back({"DeviceOut"});
     return 1;
 }
 

src/audio_core/audio_render_manager.cpp

@@ -25,8 +25,8 @@ SystemManager& Manager::GetSystemManager() {
     return *system_manager;
 }
 
-Result Manager::GetWorkBufferSize(const AudioRendererParameterInternal& params,
-                                  u64& out_count) const {
+auto Manager::GetWorkBufferSize(const AudioRendererParameterInternal& params, u64& out_count)
+    -> Result {
     if (!CheckValidRevision(params.revision)) {
         return Service::Audio::ERR_INVALID_REVISION;
     }
@@ -54,7 +54,7 @@ void Manager::ReleaseSessionId(const s32 session_id) {
     session_ids[--session_count] = session_id;
 }
 
-u32 Manager::GetSessionCount() const {
+u32 Manager::GetSessionCount() {
     std::scoped_lock l{session_lock};
     return session_count;
 }

src/audio_core/audio_render_manager.h

@@ -46,7 +46,7 @@ public:
      * @param out_count - Output size of the required workbuffer.
      * @return Result code.
      */
-    Result GetWorkBufferSize(const AudioRendererParameterInternal& params, u64& out_count) const;
+    Result GetWorkBufferSize(const AudioRendererParameterInternal& params, u64& out_count);
 
     /**
      * Get a new session id.
@@ -60,14 +60,14 @@ public:
      *
      * @return The number of active sessions.
      */
-    u32 GetSessionCount() const;
+    u32 GetSessionCount();
 
     /**
      * Add a renderer system to the manager.
-     * The system will be regularly called to generate commands for the AudioRenderer.
+     * The system will be reguarly called to generate commands for the AudioRenderer.
      *
      * @param system - The system to add.
-     * @return True if the system was successfully added, otherwise false.
+     * @return True if the system was sucessfully added, otherwise false.
      */
     bool AddSystem(System& system);
 
@@ -75,7 +75,7 @@ public:
      * Remove a renderer system from the manager.
      *
      * @param system - The system to remove.
-     * @return True if the system was successfully removed, otherwise false.
+     * @return True if the system was sucessfully removed, otherwise false.
      */
     bool RemoveSystem(System& system);
 
@@ -94,7 +94,7 @@ private:
     /// Number of active renderers
     u32 session_count{};
     /// Lock for interacting with the sessions
-    mutable std::mutex session_lock{};
+    std::mutex session_lock{};
     /// Regularly generates commands from the registered systems for the AudioRenderer
     std::unique_ptr<SystemManager> system_manager{};
 };

src/audio_core/device/audio_buffer.h

@@ -8,10 +8,6 @@
 namespace AudioCore {
 
 struct AudioBuffer {
-    /// Timestamp this buffer started playing.
-    u64 start_timestamp;
-    /// Timestamp this buffer should finish playing.
-    u64 end_timestamp;
     /// Timestamp this buffer completed playing.
     s64 played_timestamp;
     /// Game memory address for these samples.

src/audio_core/device/audio_buffers.h

@@ -36,7 +36,7 @@ public:
      *
      * @param buffer - The new buffer.
      */
-    void AppendBuffer(const AudioBuffer& buffer) {
+    void AppendBuffer(AudioBuffer& buffer) {
         std::scoped_lock l{lock};
         buffers[appended_index] = buffer;
         appended_count++;
@@ -58,7 +58,6 @@ public:
             if (index < 0) {
                 index += N;
             }
-
             out_buffers.push_back(buffers[index]);
             registered_count++;
             registered_index = (registered_index + 1) % append_limit;
@@ -88,12 +87,10 @@ public:
     /**
      * Release all registered buffers.
      *
-     * @param core_timing - The CoreTiming instance
-     * @param session     - The device session
-     *
+     * @param timestamp - The released timestamp for this buffer.
      * @return Is the buffer was released.
      */
-    bool ReleaseBuffers(const Core::Timing::CoreTiming& core_timing, const DeviceSession& session) {
+    bool ReleaseBuffers(Core::Timing::CoreTiming& core_timing, DeviceSession& session) {
         std::scoped_lock l{lock};
         bool buffer_released{false};
         while (registered_count > 0) {
@@ -103,7 +100,7 @@ public:
             }
 
             // Check with the backend if this buffer can be released yet.
-            if (!session.IsBufferConsumed(buffers[index])) {
+            if (!session.IsBufferConsumed(buffers[index].tag)) {
                 break;
             }
 
@@ -283,16 +280,6 @@ public:
         return true;
     }
 
-    u64 GetNextTimestamp() const {
-        // Iterate backwards through the buffer queue, and take the most recent buffer's end
-        std::scoped_lock l{lock};
-        auto index{appended_index - 1};
-        if (index < 0) {
-            index += append_limit;
-        }
-        return buffers[index].end_timestamp;
-    }
-
 private:
     /// Buffer lock
     mutable std::recursive_mutex lock{};

src/audio_core/device/device_session.cpp

@@ -7,20 +7,11 @@
 #include "audio_core/device/device_session.h"
 #include "audio_core/sink/sink_stream.h"
 #include "core/core.h"
-#include "core/core_timing.h"
 #include "core/memory.h"
 
 namespace AudioCore {
 
-using namespace std::literals;
-constexpr auto INCREMENT_TIME{5ms};
-
-DeviceSession::DeviceSession(Core::System& system_)
-    : system{system_}, thread_event{Core::Timing::CreateEvent(
-                           "AudioOutSampleTick",
-                           [this](std::uintptr_t, s64 time, std::chrono::nanoseconds) {
-                               return ThreadFunc();
-                           })} {}
+DeviceSession::DeviceSession(Core::System& system_) : system{system_} {}
 
 DeviceSession::~DeviceSession() {
     Finalize();
@@ -59,26 +50,25 @@ void DeviceSession::Finalize() {
 }
 
 void DeviceSession::Start() {
-    if (stream) {
-        stream->Start();
-        system.CoreTiming().ScheduleLoopingEvent(std::chrono::nanoseconds::zero(), INCREMENT_TIME,
-                                                 thread_event);
-    }
+    stream->SetPlayedSampleCount(played_sample_count);
+    stream->Start();
 }
 
 void DeviceSession::Stop() {
     if (stream) {
+        played_sample_count = stream->GetPlayedSampleCount();
         stream->Stop();
-        system.CoreTiming().UnscheduleEvent(thread_event, {});
     }
 }
 
-void DeviceSession::AppendBuffers(std::span<const AudioBuffer> buffers) const {
-    for (const auto& buffer : buffers) {
+void DeviceSession::AppendBuffers(std::span<AudioBuffer> buffers) const {
+    auto& memory{system.Memory()};
+
+    for (size_t i = 0; i < buffers.size(); i++) {
         Sink::SinkBuffer new_buffer{
-            .frames = buffer.size / (channel_count * sizeof(s16)),
+            .frames = buffers[i].size / (channel_count * sizeof(s16)),
             .frames_played = 0,
-            .tag = buffer.tag,
+            .tag = buffers[i].tag,
             .consumed = false,
         };
 
@@ -86,22 +76,26 @@ void DeviceSession::AppendBuffers(std::span<const AudioBuffer> buffers) const {
             std::vector<s16> samples{};
             stream->AppendBuffer(new_buffer, samples);
         } else {
-            std::vector<s16> samples(buffer.size / sizeof(s16));
-            system.Memory().ReadBlockUnsafe(buffer.samples, samples.data(), buffer.size);
+            std::vector<s16> samples(buffers[i].size / sizeof(s16));
+            memory.ReadBlockUnsafe(buffers[i].samples, samples.data(), buffers[i].size);
             stream->AppendBuffer(new_buffer, samples);
         }
     }
 }
 
-void DeviceSession::ReleaseBuffer(const AudioBuffer& buffer) const {
+void DeviceSession::ReleaseBuffer(AudioBuffer& buffer) const {
     if (type == Sink::StreamType::In) {
+        auto& memory{system.Memory()};
         auto samples{stream->ReleaseBuffer(buffer.size / sizeof(s16))};
-        system.Memory().WriteBlockUnsafe(buffer.samples, samples.data(), buffer.size);
+        memory.WriteBlockUnsafe(buffer.samples, samples.data(), buffer.size);
     }
 }
 
-bool DeviceSession::IsBufferConsumed(const AudioBuffer& buffer) const {
-    return played_sample_count >= buffer.end_timestamp;
+bool DeviceSession::IsBufferConsumed(u64 tag) const {
+    if (stream) {
+        return stream->IsBufferConsumed(tag);
+    }
+    return true;
 }
 
 void DeviceSession::SetVolume(f32 volume) const {
@@ -111,22 +105,10 @@ void DeviceSession::SetVolume(f32 volume) const {
 }
 
 u64 DeviceSession::GetPlayedSampleCount() const {
-    return played_sample_count;
-}
-
-std::optional<std::chrono::nanoseconds> DeviceSession::ThreadFunc() {
-    // Add 5ms of samples at a 48K sample rate.
-    played_sample_count += 48'000 * INCREMENT_TIME / 1s;
-    if (type == Sink::StreamType::Out) {
-        system.AudioCore().GetAudioManager().SetEvent(Event::Type::AudioOutManager, true);
-    } else {
-        system.AudioCore().GetAudioManager().SetEvent(Event::Type::AudioInManager, true);
+    if (stream) {
+        return stream->GetPlayedSampleCount();
     }
-    return std::nullopt;
-}
-
-void DeviceSession::SetRingSize(u32 ring_size) {
-    stream->SetRingSize(ring_size);
+    return 0;
 }
 
 } // namespace AudioCore

src/audio_core/device/device_session.h

@@ -3,9 +3,6 @@
 
 #pragma once
 
-#include <chrono>
-#include <memory>
-#include <optional>
 #include <span>
 
 #include "audio_core/common/common.h"
@@ -14,13 +11,9 @@
 
 namespace Core {
 class System;
-namespace Timing {
-struct EventType;
-} // namespace Timing
-} // namespace Core
+}
 
 namespace AudioCore {
-
 namespace Sink {
 class SinkStream;
 struct SinkBuffer;
@@ -62,23 +55,22 @@ public:
      *
      * @param buffers - The buffers to play.
      */
-    void AppendBuffers(std::span<const AudioBuffer> buffers) const;
+    void AppendBuffers(std::span<AudioBuffer> buffers) const;
 
     /**
      * (Audio In only) Pop samples from the backend, and write them back to this buffer's address.
      *
      * @param buffer - The buffer to write to.
      */
-    void ReleaseBuffer(const AudioBuffer& buffer) const;
+    void ReleaseBuffer(AudioBuffer& buffer) const;
 
     /**
      * Check if the buffer for the given tag has been consumed by the backend.
      *
-     * @param buffer - the buffer to check.
-     *
+     * @param tag - Unqiue tag of the buffer to check.
      * @return true if the buffer has been consumed, otherwise false.
      */
-    bool IsBufferConsumed(const AudioBuffer& buffer) const;
+    bool IsBufferConsumed(u64 tag) const;
 
     /**
      * Start this device session, starting the backend stream.
@@ -104,16 +96,6 @@ public:
      */
     u64 GetPlayedSampleCount() const;
 
-    /*
-     * CoreTiming callback to increment played_sample_count over time.
-     */
-    std::optional<std::chrono::nanoseconds> ThreadFunc();
-
-    /*
-     * Set the size of the ring buffer.
-     */
-    void SetRingSize(u32 ring_size);
-
 private:
     /// System
     Core::System& system;
@@ -136,13 +118,9 @@ private:
     /// Applet resource user id of this device session
     u64 applet_resource_user_id{};
     /// Total number of samples played by this device session
-    std::atomic<u64> played_sample_count{};
-    /// Event increasing the played sample count every 5ms
-    std::shared_ptr<Core::Timing::EventType> thread_event;
+    u64 played_sample_count{};
     /// Is this session initialised?
     bool initialized{};
-    /// Buffer queue
-    std::vector<AudioBuffer> buffer_queue{};
 };
 
 } // namespace AudioCore

src/audio_core/in/audio_in.cpp

@@ -72,7 +72,7 @@ Kernel::KReadableEvent& In::GetBufferEvent() {
     return event->GetReadableEvent();
 }
 
-f32 In::GetVolume() const {
+f32 In::GetVolume() {
     std::scoped_lock l{parent_mutex};
     return system.GetVolume();
 }
@@ -82,17 +82,17 @@ void In::SetVolume(f32 volume) {
     system.SetVolume(volume);
 }
 
-bool In::ContainsAudioBuffer(u64 tag) const {
+bool In::ContainsAudioBuffer(u64 tag) {
     std::scoped_lock l{parent_mutex};
     return system.ContainsAudioBuffer(tag);
 }
 
-u32 In::GetBufferCount() const {
+u32 In::GetBufferCount() {
     std::scoped_lock l{parent_mutex};
     return system.GetBufferCount();
 }
 
-u64 In::GetPlayedSampleCount() const {
+u64 In::GetPlayedSampleCount() {
     std::scoped_lock l{parent_mutex};
     return system.GetPlayedSampleCount();
 }

src/audio_core/in/audio_in.h

@@ -102,7 +102,7 @@ public:
      *
      * @return The current volume.
      */
-    f32 GetVolume() const;
+    f32 GetVolume();
 
     /**
      * Set the system volume.
@@ -117,21 +117,21 @@ public:
      * @param tag - The tag to search for.
      * @return True if the buffer is in the system, otherwise false.
      */
-    bool ContainsAudioBuffer(u64 tag) const;
+    bool ContainsAudioBuffer(u64 tag);
 
     /**
      * Get the maximum number of buffers.
      *
      * @return The maximum number of buffers.
      */
-    u32 GetBufferCount() const;
+    u32 GetBufferCount();
 
     /**
      * Get the total played sample count for this audio in.
      *
      * @return The played sample count.
      */
-    u64 GetPlayedSampleCount() const;
+    u64 GetPlayedSampleCount();
 
 private:
     /// The AudioIn::Manager this audio in is registered with