fix FTBFS and CI

Author: BLumia

.github/workflows/linux.yml

@@ -9,17 +9,21 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: '6.11.0'
+          modules: 'qtmultimedia'
       - name: Install build dept.
         run: |
           sudo apt update
-          sudo apt install cmake qt6-base-dev qt6-multimedia-dev
+          sudo apt install cmake
           # for linuxdeploy: https://github.com/AppImage/AppImageKit/wiki/FUSE
-          # linuxdeploy-plugin-qt still requires qmake currently: https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/156
           sudo add-apt-repository universe
-          sudo apt install libfuse2 qmake6
+          sudo apt install libfuse2
       - name: Get linuxdeploy
         run: |
           wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
@@ -31,13 +35,11 @@ jobs:
           cmake -B build .
           cmake --build build -j
       - name: Package
-        env:
-          QMAKE: /usr/bin/qmake6
         run: |
           ./linuxdeploy-x86_64.AppImage --appdir AppDir -e build/thplayer -d assets/thplayer.desktop -i assets/thplayer.svg --icon-filename thplayer -p qt -o appimage
           mv TouHou_Player*.AppImage thplayer-linux.AppImage
       - name: Upload
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: Linux-Build
           path: thplayer-linux.AppImage

.github/workflows/macos.yml

@@ -9,29 +9,19 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.7.0'
+          version: '6.11.0'
           modules: 'qtmultimedia'
-      - name: Install Conan
-        id: conan
-        working-directory: ./
-        shell: bash
-        run: |
-          pip3 install wheel setuptools
-          pip3 install conan --upgrade
-          conan --version
-          conan profile detect
       - name: Build
         working-directory: ./
         run: |
-          conan install --requires=icu/74.2 --generator CMakeDeps --generator CMakeToolchain --build=missing
-          cmake . --preset conan-release
-          cmake --build --preset conan-release
+          cmake -Bbuild . -DCMAKE_BUILD_TYPE=Release
+          cmake --build build --config Release
       - name: Package
         id: package
         working-directory: ./
@@ -41,7 +31,7 @@ jobs:
           zip -r9 --symlinks thplayer-macos.zip thplayer.app
       - name: Upload
         if: steps.package.conclusion == 'success'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: macOS-Build
           path: thplayer-macos.zip

.gitignore

@@ -1,11 +1,16 @@
 # User Config
-*.pro.user
+*.user
 
 # Autosave
 *.autosave
 
 # Build Dir
 [Bb]uild/
+build-*/
+
+# IDE and clangd Files
+.vscode/
+.cache/
 
 # Debian Build Helper
 debian/.debhelper/

loopedpcmstreamer.cpp

@@ -64,7 +64,7 @@ void LoopedPCMStreamer::load()
     if (!maph)
     {
         unload();
-        return false;
+        return;
     }
 
     SYSTEM_INFO snfo;
@@ -79,7 +79,7 @@ void LoopedPCMStreamer::load()
     if (!mapped)
     {
         unload();
-        return false;
+        return;
     }
 #endif