Merge branch 'develop' into another-develop

.ci/build-opus.sh

+#!/bin/sh
+set -x
+set -o errexit
+
+cd miniaudio
+
+external_built_dir="$PWD/external-built"
+
+is_macos=false
+if [ "$(uname)" = "Darwin" ]; then
+  is_macos=true
+fi
+
+maybe_patch_configure() {
+  if $is_macos; then
+    sed -i.bak 's/-force_cpusubtype_ALL//g' configure*
+  fi
+}
+
+build_single_thing() {
+  lib_name="$1"
+  cd "external/$lib_name"
+  shift
+  maybe_patch_configure
+  PKG_CONFIG_PATH="$external_built_dir/lib/pkgconfig" ./configure --prefix="$external_built_dir" --enable-static=yes --enable-shared=no "$@"
+  make -j$(nproc)
+  make install
+  cd ../..
+}
+
+build_single_thing ogg
+build_single_thing opus
+build_single_thing opusfile --disable-examples --disable-http
+build_single_thing vorbis --with-ogg="$external_built_dir"
+
+cd ..

.ci/exec-macos-platform.sh

@@ -8,13 +8,20 @@ export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
 export EVENT_LIB_DIR=$PWD/libevent-stable/lib
 export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
 export IRRLICHT_LIB_DIR=$PWD/irrlicht/lib/$(arch)
+export OPUS_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus
+export OPUS_LIB_DIR=$PWD/miniaudio/external-built/lib
+export VORBIS_INCLUDE_DIR=$PWD/miniaudio/external-built/include
+export VORBIS_LIB_DIR=$PWD/miniaudio/external-built/lib
+export OGG_INCLUDE_DIR=$PWD/miniaudio/external-built/include
+export OGG_LIB_DIR=$PWD/miniaudio/external-built/lib
 
 ./.ci/libevent-prebuild.sh
+./.ci/build-opus.sh
 
 ./premake5 gmake --cc=clang --build-freetype --build-sqlite
 
 cd build
-make config=release -j4
+make config=release -j$(nproc)
 cd ..
 
 mkdir ygopro-platforms

.ci/libevent-prebuild.sh

-#!/bin/bash
+#!/bin/sh
 set -x
 set -o errexit
 # PROCESSOR_COUNT=4
 
-wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+if [ -d "libevent-stable" ]; then
+  rm -rf libevent-stable
+fi
+
+if [ ! -d "libevent-2.0.22-stable" ]; then
+  wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+fi
+
+install_path="$PWD/libevent-stable"
+
 cd libevent-2.0.22-stable
-./configure --prefix=$PWD/libevent-stable --disable-openssl --enable-static=yes --enable-shared=no
-make -j$PROCESSOR_COUNT
+./configure "--prefix=$install_path" --disable-openssl --enable-static=yes --enable-shared=no "$@"
+make -j$(nproc)
 make install
 cd ..
-mv libevent-2.0.22-stable/libevent-stable .
-rm -rf libevent-2.0.22-stable

.ci/pack-linux-dlc.sh

@@ -8,6 +8,10 @@ if [[ -z "$TARGET_PLATFORM" ]]; then
     TARGET_PLATFORM=linux
 fi
 
+if [[ "$TARGET_PLATFORM" != "linuxarm" ]]; then
+    ARCHIVE_FILES+=(sound)
+fi
+
 apt update && apt -y install tar zstd
 mkdir dist replay
 

.ci/pack-linux.sh

@@ -2,7 +2,7 @@
 set -x
 set -o errexit
 
-ARCHIVE_FILES=(ygopro LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts pack)
+ARCHIVE_FILES=(ygopro LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay windbot bot bot.conf locales fonts pack)
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
@@ -10,6 +10,10 @@ if [[ -z "$TARGET_PLATFORM" ]]; then
     TARGET_PLATFORM=linux
 fi
 
+if [[ "$TARGET_PLATFORM" != "linuxarm" ]]; then
+    ARCHIVE_FILES+=(sound)
+fi
+
 apt update && apt -y install tar git zstd
 mkdir dist replay
 

.ci/prepare-miniaudio.sh

+#!/bin/sh
+set -x
+set -o errexit
+
+if [ ! -d "miniaudio" ]; then
+  git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+fi
+
+cp -rf miniaudio/extras/miniaudio_split/miniaudio.* miniaudio/
+
+mkdir -p miniaudio/external
+
+install_external() {
+  dir="$1"
+  url="$2"
+  if [ ! -d "miniaudio/external/$dir" ]; then
+    mkdir -p "miniaudio/external/$dir"
+    # Download the external library and strip one level of directories from the archive
+    wget -O - "$url" | tar --strip-components=1 -C "miniaudio/external/$dir" -zxf -
+  fi
+}
+
+install_external "ogg" "https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.gz"
+install_external "opus" "https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz"
+install_external "opusfile" "https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"
+install_external "vorbis" "https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.gz"

.github/workflows/build.yml

@@ -12,6 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2019, windows-2022]
+        audiolib: [miniaudio, irrklang]
 
     runs-on: ${{ matrix.os }}
 
@@ -90,6 +91,79 @@ jobs:
         7z x ${{ steps.sqlite.outputs.filepath }}
         move sqlite-amalgamation-3490100 sqlite3
 
+    - name: Download miniaudio
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+        cd miniaudio
+        xcopy /Y extras\miniaudio_split\miniaudio.* .
+        cd ..
+
+    - name: Download ogg
+      if: matrix.audiolib == 'miniaudio'
+      id: ogg
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.gz
+
+    - name: Extract ogg
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        tar xf ${{ steps.ogg.outputs.filepath }}
+        move libogg-1.3.5 miniaudio/external/ogg
+
+    - name: Download opus
+      if: matrix.audiolib == 'miniaudio'
+      id: opus
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz
+    
+    - name: Extract opus
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        tar xf ${{ steps.opus.outputs.filepath }}
+        move opus-1.5.2 miniaudio/external/opus
+
+    - name: Download opusfile
+      if: matrix.audiolib == 'miniaudio'
+      id: opusfile
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz
+
+    - name: Extract opusfile
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        tar xf ${{ steps.opusfile.outputs.filepath }}
+        move opusfile-0.12 miniaudio/external/opusfile
+
+    - name: Download vorbis
+      if: matrix.audiolib == 'miniaudio'
+      id: vorbis
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.gz
+
+    - name: Extract vorbis
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        tar xf ${{ steps.vorbis.outputs.filepath }}
+        move libvorbis-1.3.7 miniaudio/external/vorbis
+
+    - name: Download irrKlang
+      if: matrix.audiolib == 'irrklang'
+      id: irrKlang
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://www.ambiera.at/downloads/irrKlang-32bit-1.6.0.zip
+
+    - name: Extract irrKlang
+      if: matrix.audiolib == 'irrklang'
+      run: |
+        7z x ${{ steps.irrKlang.outputs.filepath }}
+        move irrKlang-1.6.0 irrKlang
+
     - name: Download irrlicht
       run: |
         git clone --depth=1 https://github.com/mercury233/irrlicht
@@ -123,16 +197,26 @@ jobs:
         xcopy /E premake\* .
         xcopy /E resource\* .
 
-    - name: Use premake to generate Visual Studio solution (2019)
-      if: matrix.os == 'windows-2019'
+    - name: Use premake to generate Visual Studio solution (2019, miniaudio)
+      if: matrix.os == 'windows-2019' && matrix.audiolib == 'miniaudio'
       run: |
         .\premake5.exe vs2019 --winxp-support
 
-    - name: Use premake to generate Visual Studio solution (2022)
-      if: matrix.os == 'windows-2022'
+    - name: Use premake to generate Visual Studio solution (2022, miniaudio)
+      if: matrix.os == 'windows-2022' && matrix.audiolib == 'miniaudio'
       run: |
         .\premake5.exe vs2022
 
+    - name: Use premake to generate Visual Studio solution (2019, irrKlang)
+      if: matrix.os == 'windows-2019' && matrix.audiolib == 'irrklang'
+      run: |
+        .\premake5.exe vs2019 --winxp-support --audio-lib=irrklang
+
+    - name: Use premake to generate Visual Studio solution (2022, irrKlang)
+      if: matrix.os == 'windows-2022' && matrix.audiolib == 'irrklang'
+      run: |
+        .\premake5.exe vs2022 --audio-lib=irrklang
+
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2
 
@@ -143,7 +227,7 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: YGOPro-${{ matrix.os }}
+        name: YGOPro-${{ matrix.os }}-${{ matrix.audiolib }}
         path: |
           bin/release/YGOPro.exe
 
@@ -186,7 +270,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y libevent-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev libsqlite3-dev libxxf86vm-dev
+        sudo apt-get install -y libevent-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev libsqlite3-dev libxxf86vm-dev libopusfile-dev libvorbis-dev
 
     - name: Download premake
       id: premake
@@ -211,6 +295,13 @@ jobs:
         tar xf ${{ steps.lua.outputs.filepath }}
         mv lua-5.4.7 lua
 
+    - name: Download miniaudio
+      run: |
+        git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+        cd miniaudio
+        cp extras/miniaudio_split/miniaudio.* .
+        cd ..
+
     - name: Download irrlicht
       run: |
         git clone --depth=1 https://github.com/mercury233/irrlicht
@@ -223,7 +314,8 @@ jobs:
     - name: Use premake to generate make files
       run: |
         ./premake5 gmake \
-          --freetype-include-dir="/usr/include/freetype2"
+          --freetype-include-dir="/usr/include/freetype2" \
+          --opus-include-dir="/usr/include/opus"
 
     - name: Make
       run: |
@@ -271,9 +363,9 @@ jobs:
 #        git pull origin master
 #        cd ..
 
-#    - name: Install dependencies
-#      run: |
-#        brew install freetype libevent libx11 sqlite zlib
+    - name: Install dependencies
+      run: |
+        brew install freetype libevent libx11 sqlite opus opusfile libvorbis
 
     - name: Download premake
       id: premake
@@ -298,6 +390,13 @@ jobs:
         tar xf ${{ steps.lua.outputs.filepath }}
         mv lua-5.4.7 lua
 
+    - name: Download miniaudio
+      run: |
+        git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+        cd miniaudio
+        cp extras/miniaudio_split/miniaudio.* .
+        cd ..
+
     - name: Download irrlicht
       run: |
         git clone --depth=1 https://github.com/mercury233/irrlicht
@@ -319,6 +418,7 @@ jobs:
         ./premake5 gmake \
           --cc=clang \
           --freetype-include-dir="/usr/local/include/freetype2" \
+          --opus-include-dir="/usr/local/include/opus" \
           --irrlicht-include-dir="../irrlicht/include" \
           --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
 
@@ -333,6 +433,12 @@ jobs:
           --freetype-lib-dir="/opt/homebrew/lib" \
           --sqlite-include-dir="/opt/homebrew/opt/sqlite/include" \
           --sqlite-lib-dir="/opt/homebrew/opt/sqlite/lib" \
+          --miniaudio-include-dir="/opt/homebrew/include" \
+          --miniaudio-lib-dir="/opt/homebrew/lib" \
+          --opus-include-dir="/opt/homebrew/include/opus" \
+          --opus-lib-dir="/opt/homebrew/lib" \
+          --vorbis-include-dir="/opt/homebrew/include" \
+          --vorbis-lib-dir="/opt/homebrew/lib" \
           --irrlicht-include-dir="../irrlicht/include" \
           --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
 

.gitignore

@@ -16,6 +16,7 @@ build
 /irrklang
 /irrlicht*
 /lua
+/miniaudio
 
 # gframe additionals
 /gframe/ygopro.ico

.gitlab-ci.yml

@@ -24,6 +24,8 @@ mat_common:
     # freetype
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/freetype-2.11.1.tar.gz | tar zfx -
     - mv freetype-2.11.1 freetype
+    # miniaudio
+    - ./.ci/prepare-miniaudio.sh
     # premake
     - cp -rf premake/* .;
   artifacts:
@@ -31,6 +33,7 @@ mat_common:
       - lua
       - freetype
       - sqlite3
+      - miniaudio
 
 mat_submodules:
   stage: prepare
@@ -134,7 +137,14 @@ exec_windows:
   variables:
     EVENT_INCLUDE_DIR: /usr/share/libevent-stable/include
     EVENT_LIB_DIR: /usr/share/libevent-stable/lib
+    OPUS_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include/opus
+    OPUS_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
+    VORBIS_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include
+    VORBIS_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
+    OGG_INCLUDE_DIR: $CI_PROJECT_DIR/miniaudio/external-built/include
+    OGG_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
   script:
+    - ./.ci/build-opus.sh
     - premake5 gmake --build-freetype --build-sqlite --build-irrlicht
     - cd build
     - make config=release -j$(nproc)

copy.sh

-#!/bin/sh
-cp -r premake/* .

gframe/duelclient.cpp

@@ -1365,11 +1365,11 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
 		}
 		//playing custom bgm
 		case 21: { //HINT_MUSIC
-			char BGMName[1024];
 			if (data) {
+				char textBufferU[1024];
 				myswprintf(textBuffer, L"./sound/BGM/custom/%ls.mp3", dataManager.GetDesc(data));			
-				BufferIO::EncodeUTF8(textBuffer, BGMName);
-				soundManager.PlayCustomBGM(BGMName);
+				BufferIO::EncodeUTF8(textBuffer, textBufferU);
+				soundManager.PlayCustomBGM(textBufferU);
 			} else {
 				soundManager.StopBGM();
 			}
@@ -1377,11 +1377,11 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
 		}
 		//playing custom sound effect
 		case 22: { //HINT_SOUND
-			char SoundName[1024];
 			if (data) {
+				char textBufferU[1024];
 				myswprintf(textBuffer, L"./sound/custom/%ls.wav", dataManager.GetDesc(data));
-				BufferIO::EncodeUTF8(textBuffer, SoundName);
-				soundManager.PlayCustomSound(SoundName);
+				BufferIO::EncodeUTF8(textBuffer, textBufferU);
+				soundManager.PlayCustomSound(textBufferU);
 			} else {
 				soundManager.StopSound();
 			}
@@ -1389,11 +1389,11 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
 		}
 		//playing custom bgm in ogg format
 		case 23: { //HINT_MUSIC_OGG
-			char BGMName[1024];
 			if (data) {
+				char textBufferU[1024];
 				myswprintf(textBuffer, L"./sound/BGM/custom/%ls.ogg", dataManager.GetDesc(data));			
-				BufferIO::EncodeUTF8(textBuffer, BGMName);
-				soundManager.PlayCustomBGM(BGMName);
+				BufferIO::EncodeUTF8(textBuffer, textBufferU);
+				soundManager.PlayCustomBGM(textBufferU);
 			} else {
 				soundManager.StopBGM();
 			}

gframe/game.cpp

@@ -227,7 +227,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Overdose", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Bumblebee", (PRO_VERSION & 0xf000U) >> 12, (PRO_VERSION & 0x0ff0U) >> 4, PRO_VERSION & 0x000fU);
 	wMainMenu = env->addWindow(irr::core::rect<irr::s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(irr::core::rect<irr::s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

gframe/miniaudio/premake5.lua

-project "cminiaudio"
-    kind "StaticLib"
-    files { "*.c", "*.h" }
-
-    filter "action:vs*"
-        forceincludes { "stb_vorbis.h" }
-
-    filter "not action:vs*"
-        forceincludes { "./stb_vorbis.h" }
-
-    filter "system:linux"
-        links { "dl", "pthread", "m" }

gframe/premake5.lua

 include "lzma/."
 include "spmemvfs/."
-if USE_AUDIO then
-    include "miniaudio/."
-end
 
 project "YGOPro"
     kind "WindowedApp"
@@ -43,7 +40,29 @@ project "YGOPro"
 
     if USE_AUDIO then
         defines { "YGOPRO_USE_AUDIO" }
-        links { "cminiaudio" }
+        if AUDIO_LIB == "miniaudio" then
+            defines { "YGOPRO_USE_MINIAUDIO" }
+            includedirs { "../miniaudio" }
+            links { "miniaudio" }
+            if MINIAUDIO_SUPPORT_OPUS_VORBIS then
+                defines { "YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS" }
+                includedirs { "../miniaudio/extras/decoders/libopus", "../miniaudio/extras/decoders/libvorbis" }
+                if not MINIAUDIO_BUILD_OPUS_VORBIS then
+                    links { "opusfile", "vorbisfile", "opus", "vorbis", "ogg" }
+                    libdirs { OPUS_LIB_DIR, VORBIS_LIB_DIR, OGG_LIBDIR }
+                end
+            end
+        end
+        if AUDIO_LIB == "irrklang" then
+            defines { "YGOPRO_USE_IRRKLANG" }
+            includedirs { IRRKLANG_INCLUDE_DIR }
+            if not IRRKLANG_PRO then
+                libdirs { IRRKLANG_LIB_DIR }
+            end
+            if IRRKLANG_PRO_BUILD_IKPMP3 then
+                links { "ikpmp3" }
+            end
+        end
     end
 
     filter "system:windows"
@@ -51,6 +70,17 @@ project "YGOPro"
         files "ygopro.rc"
         libdirs { "$(DXSDK_DIR)Lib/x86" }
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32", "Dnsapi" }
+        if USE_AUDIO and AUDIO_LIB == "irrklang" then
+            links { "irrKlang" }
+            if IRRKLANG_PRO then
+                defines { "IRRKLANG_STATIC" }
+                filter { "not configurations:Debug" }
+                    libdirs { IRRKLANG_PRO_RELEASE_LIB_DIR }
+                filter { "configurations:Debug" }
+                    libdirs { IRRKLANG_PRO_DEBUG_LIB_DIR }
+                filter {}
+            end
+        end
     filter "not system:windows"
         links { "event_pthreads", "dl", "pthread", "resolv" }
     filter "system:macosx"
@@ -60,6 +90,13 @@ project "YGOPro"
             buildoptions { "--target=arm64-apple-macos12" }
             linkoptions { "-arch arm64" }
         end
+        if USE_AUDIO and AUDIO_LIB == "irrklang" then
+            links { "irrklang" }
+        end
     filter "system:linux"
         linkoptions { "-static-libstdc++", "-static-libgcc" }
         links { "GL", "X11", "Xxf86vm" }
+        if USE_AUDIO and AUDIO_LIB == "irrklang" then
+            links { "IrrKlang" }
+            linkoptions{ IRRKLANG_LINK_RPATH }
+        end

gframe/sound_manager.cpp

 #include "sound_manager.h"
 #include "myfilesystem.h"
+#if defined(YGOPRO_USE_MINIAUDIO) && defined(YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS)
+#include <miniaudio_libopus.h>
+#include <miniaudio_libvorbis.h>
+#endif
+#ifdef IRRKLANG_STATIC
+#include "../ikpmp3/ikpMP3.h"
+#endif
 
 namespace ygo {
 
@@ -12,11 +19,42 @@ bool SoundManager::Init() {
 	RefreshBGMList();
 	bgm_process = false;
 	rnd.reset((unsigned int)std::time(nullptr));
-	if(ma_engine_init(nullptr, &engineSound) || ma_engine_init(nullptr, &engineMusic)) {
+#ifdef YGOPRO_USE_MINIAUDIO
+	engineConfig = ma_engine_config_init();
+#ifdef YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS
+	ma_decoding_backend_vtable* pCustomBackendVTables[] =
+	{
+		ma_decoding_backend_libvorbis,
+		ma_decoding_backend_libopus
+	};
+	resourceManagerConfig = ma_resource_manager_config_init();
+	resourceManagerConfig.ppCustomDecodingBackendVTables = pCustomBackendVTables;
+	resourceManagerConfig.customDecodingBackendCount = sizeof(pCustomBackendVTables) / sizeof(pCustomBackendVTables[0]);
+	resourceManagerConfig.pCustomDecodingBackendUserData = NULL;
+	if(ma_resource_manager_init(&resourceManagerConfig, &resourceManager) != MA_SUCCESS) {
+		return false;
+	}
+	engineConfig.pResourceManager = &resourceManager;
+#endif
+	playingSoundEffect = FALSE;
+	if(ma_engine_init(&engineConfig, &engineSound) != MA_SUCCESS || ma_engine_init(&engineConfig, &engineMusic) != MA_SUCCESS) {
 		return false;
 	} else {
 		return true;
 	}
+#endif // YGOPRO_USE_MINIAUDIO
+#ifdef YGOPRO_USE_IRRKLANG
+	engineSound = irrklang::createIrrKlangDevice();
+	engineMusic = irrklang::createIrrKlangDevice();
+	if(!engineSound || !engineMusic) {
+		return false;
+	} else {
+#ifdef IRRKLANG_STATIC
+		irrklang::ikpMP3Init(engineMusic);
+#endif
+		return true;
+	}
+#endif // YGOPRO_USE_IRRKLANG
 #endif // YGOPRO_USE_AUDIO
 	return false;
 }
@@ -36,13 +74,41 @@ void SoundManager::RefreshBGMList() {
 void SoundManager::RefershBGMDir(std::wstring path, int scene) {
 	std::wstring search = L"./sound/BGM/" + path;
 	FileSystem::TraversalDir(search.c_str(), [this, &path, scene](const wchar_t* name, bool isdir) {
-		if(!isdir && (IsExtension(name, L".mp3") || IsExtension(name, L".ogg"))) {
+		if(!isdir && (
+			IsExtension(name, L".mp3")
+#if defined(YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS) || defined(YGOPRO_USE_IRRKLANG)
+			|| IsExtension(name, L".ogg")
+#endif
+			)) {
 			std::wstring filename = path + L"/" + name;
 			BGMList[BGM_ALL].push_back(filename);
 			BGMList[scene].push_back(filename);
 		}
 	});
 }
+void SoundManager::PlaySound(char* sound) {
+#ifdef YGOPRO_USE_AUDIO
+	if(!mainGame->chkEnableSound->isChecked())
+		return;
+#ifdef YGOPRO_USE_MINIAUDIO
+	StopSound();
+	SetSoundVolume(mainGame->gameConf.sound_volume);
+	playingSoundEffect = TRUE;
+#ifdef _WIN32
+	wchar_t sound_w[1024];
+	BufferIO::DecodeUTF8(sound, sound_w);
+	ma_sound_init_from_file_w(&engineSound, sound_w, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundEffect);
+#else
+	ma_sound_init_from_file(&engineSound, sound, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundEffect);
+#endif
+	ma_sound_start(&soundEffect);
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+	SetSoundVolume(mainGame->gameConf.sound_volume);
+	engineSound->play2D(soundPath);
+#endif
+#endif
+}
 void SoundManager::PlaySoundEffect(int sound) {
 	char soundName[32];
 	switch(sound) {
@@ -111,7 +177,7 @@ void SoundManager::PlaySoundEffect(int sound) {
 		break;
 	}
 	case SOUND_RECOVER: {
-		strcpy(soundName, "recover");
+		strcpy(soundName, "gainlp");
 		break;
 	}
 	case SOUND_COUNTER_ADD: {
@@ -123,11 +189,11 @@ void SoundManager::PlaySoundEffect(int sound) {
 		break;
 	}
 	case SOUND_COIN: {
-		strcpy(soundName, "coin");
+		strcpy(soundName, "coinflip");
 		break;
 	}
 	case SOUND_DICE: {
-		strcpy(soundName, "dice");
+		strcpy(soundName, "diceroll");
 		break;
 	}
 	case SOUND_NEXT_TURN: {
@@ -167,7 +233,7 @@ void SoundManager::PlaySoundEffect(int sound) {
 		break;
 	}
 	case SOUND_CHAT: {
-		strcpy(soundName, "chat");
+		strcpy(soundName, "chatmessage");
 		break;
 	}
 	default:
@@ -177,12 +243,11 @@ void SoundManager::PlaySoundEffect(int sound) {
 		fprintf(mainGame->soundSequenceFile, "%llu %s\n", mainGame->totalFrame, soundName);
 	if(!mainGame->chkEnableSound->isChecked())
 		return;
+#ifdef YGOPRO_USE_AUDIO
 	char soundPath[40];
 	std::snprintf(soundPath, 40, "./sound/%s.wav", soundName);
-#ifdef YGOPRO_USE_AUDIO
-	ma_engine_set_volume(&engineSound, mainGame->gameConf.sound_volume);
-	auto res = ma_engine_play_sound(&engineSound, soundPath, nullptr);
-#endif
+	PlaySound(soundPath);
+#endif // YGOPRO_USE_AUDIO
 }
 void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
 	if(element == mainGame->wMessage) {
@@ -208,8 +273,11 @@ void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
 	}
 }
 bool SoundManager::IsCurrentlyPlaying(char* song) {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	return currentPlayingMusic[0] && strcmp(currentPlayingMusic, song) == 0 && ma_sound_is_playing(&soundBGM);
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+	return engineMusic->isCurrentlyPlaying(song);
 #endif
 	return false;
 }
@@ -219,16 +287,22 @@ void SoundManager::PlayMusic(char* song, bool loop) {
 		return;
 	if(!IsCurrentlyPlaying(song)) {
 		StopBGM();
+	SetMusicVolume(mainGame->gameConf.music_volume);
+#ifdef YGOPRO_USE_MINIAUDIO
 		strcpy(currentPlayingMusic, song);
 #ifdef _WIN32
 		wchar_t song_w[1024];
 		BufferIO::DecodeUTF8(song, song_w);
 		ma_sound_init_from_file_w(&engineMusic, song_w, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
 #else
-		auto res = ma_sound_init_from_file(&engineMusic, song, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
+		ma_sound_init_from_file(&engineMusic, song, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
 #endif
 		ma_sound_set_looping(&soundBGM, loop);
 		ma_sound_start(&soundBGM);
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+		soundBGM = engineMusic->play2D(song, loop, false, true);
+#endif
 	}
 #endif
 }
@@ -239,7 +313,11 @@ void SoundManager::PlayBGM(int scene) {
 	if(!mainGame->chkMusicMode->isChecked())
 		scene = BGM_ALL;
 	char BGMName[1024];
-	if ((scene != bgm_scene) && (bgm_scene != BGM_CUSTOM) || (scene != previous_bgm_scene) && (bgm_scene == BGM_CUSTOM) || !IsCurrentlyPlaying(currentPlayingMusic)) {
+#if defined(YGOPRO_USE_MINIAUDIO)
+	if((scene != bgm_scene) && (bgm_scene != BGM_CUSTOM) || (scene != previous_bgm_scene) && (bgm_scene == BGM_CUSTOM) || !IsCurrentlyPlaying(currentPlayingMusic)) {
+#elif defined(YGOPRO_USE_IRRKLANG)
+	if((scene != bgm_scene) && (bgm_scene != BGM_CUSTOM) || (scene != previous_bgm_scene) && (bgm_scene == BGM_CUSTOM) || (soundBGM && soundBGM->isFinished())) {
+#endif
 		int count = BGMList[scene].size();
 		if(count <= 0)
 			return;
@@ -267,32 +345,44 @@ void SoundManager::PlayCustomBGM(char* BGMName) {
 #endif
 }
 void SoundManager::PlayCustomSound(char* SoundName) {
-#ifdef YGOPRO_USE_AUDIO
-	if(!mainGame->chkEnableSound->isChecked())
-		return;
-	ma_engine_set_volume(&engineSound, mainGame->gameConf.sound_volume);
-	ma_engine_play_sound(&engineSound, SoundName, nullptr);
-#endif
+	PlaySound(SoundName);
 }
 void SoundManager::StopBGM() {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	if(!currentPlayingMusic[0])
 		return;
 	memset(currentPlayingMusic, 0, sizeof(currentPlayingMusic));
 	ma_sound_uninit(&soundBGM);
 #endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineMusic->stopAllSounds();
+#endif
 }
 void SoundManager::StopSound() {
-	// TODO: stop all sounds
+#ifdef YGOPRO_USE_MINIAUDIO
+	if(!playingSoundEffect)
+		return;
+	playingSoundEffect = FALSE;
+	ma_sound_uninit(&soundEffect);
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineSound->stopAllSounds();
+#endif
 }
 void SoundManager::SetSoundVolume(double volume) {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	ma_engine_set_volume(&engineSound, volume);
 #endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineSound->setSoundVolume(volume);
+#endif
 }
 void SoundManager::SetMusicVolume(double volume) {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	ma_engine_set_volume(&engineMusic, volume);
 #endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineMusic->setSoundVolume(volume);
+#endif
 }
 }

gframe/sound_manager.h

@@ -3,8 +3,11 @@
 
 #include "game.h"
 #include "../ocgcore/mtrandom.h"
-#ifdef YGOPRO_USE_AUDIO
-#include "miniaudio/miniaudio.h"
+#ifdef YGOPRO_USE_MINIAUDIO
+#include <miniaudio.h>
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+#include <irrKlang.h>
 #endif
 
 namespace ygo {
@@ -16,17 +19,30 @@ private:
 	int previous_bgm_scene;
 	bool bgm_process;
 	mt19937 rnd;
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
+	ma_engine_config engineConfig;
+#ifdef YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS
+	ma_resource_manager_config resourceManagerConfig;
+	ma_resource_manager resourceManager;
+#endif
 	ma_engine engineSound;
 	ma_engine engineMusic;
 	ma_sound soundBGM;
 	char currentPlayingMusic[1024]{};
+	ma_sound soundEffect;
+	char playingSoundEffect;
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+	irrklang::ISoundEngine* engineSound;
+	irrklang::ISoundEngine* engineMusic;
+	irrklang::ISound* soundBGM;
 #endif
 	void RefershBGMDir(std::wstring path, int scene);
 
 public:
 	bool Init();
 	void RefreshBGMList();
+	void PlaySound(char* sound);
 	void PlaySoundEffect(int sound);
 	void PlayDialogSound(irr::gui::IGUIElement * element);
 	bool IsCurrentlyPlaying(char* song);

ocgcore @ cd8598dd

-Subproject commit 5669c08b3a6674f25fd924633b2275eaed3fffad
+Subproject commit cd8598dd962280fabc48971c5de0e434682bb1df

premake/miniaudio/premake5.lua

+project "miniaudio"
+    kind "StaticLib"
+    files { "miniaudio.c", "miniaudio.h" }
+    defines { "MA_NO_ENCODING", "MA_NO_GENERATION", "MA_NO_NEON" }
+
+    if MINIAUDIO_SUPPORT_OPUS_VORBIS then
+        files { "extras/decoders/libopus/*", "extras/decoders/libvorbis/*" }
+        if MINIAUDIO_BUILD_OPUS_VORBIS then
+            files {
+                "external/ogg/src/bitwise.c",
+                "external/ogg/src/framing.c",
+
+                "external/opus/src/opus.c",
+                "external/opus/src/opus_decoder.c",
+                "external/opus/src/opus_multistream.c",
+                "external/opus/src/opus_multistream_decoder.c",
+
+                "external/opus/celt/bands.c",
+                "external/opus/celt/celt.c",
+                "external/opus/celt/celt_decoder.c",
+                "external/opus/celt/celt_lpc.c",
+                "external/opus/celt/cwrs.c",
+                "external/opus/celt/entcode.c",
+                "external/opus/celt/entdec.c",
+                "external/opus/celt/entenc.c",
+                "external/opus/celt/kiss_fft.c",
+                "external/opus/celt/laplace.c",
+                "external/opus/celt/mathops.c",
+                "external/opus/celt/mdct.c",
+                "external/opus/celt/modes.c",
+                "external/opus/celt/pitch.c",
+                "external/opus/celt/quant_bands.c",
+                "external/opus/celt/rate.c",
+                "external/opus/celt/vq.c",
+
+                "external/opus/celt/x86/pitch_avx.c",
+                "external/opus/celt/x86/pitch_sse.c",
+                "external/opus/celt/x86/vq_sse2.c",
+                "external/opus/celt/x86/x86_celt_map.c",
+                "external/opus/celt/x86/x86cpu.c",
+
+                "external/opus/silk/bwexpander.c",
+                "external/opus/silk/bwexpander_32.c",
+                "external/opus/silk/CNG.c",
+                "external/opus/silk/code_signs.c",
+                "external/opus/silk/dec_API.c",
+                "external/opus/silk/decode_core.c",
+                "external/opus/silk/decode_frame.c",
+                "external/opus/silk/decode_indices.c",
+                "external/opus/silk/decode_parameters.c",
+                "external/opus/silk/decode_pitch.c",
+                "external/opus/silk/decode_pulses.c",
+                "external/opus/silk/decoder_set_fs.c",
+                "external/opus/silk/gain_quant.c",
+                "external/opus/silk/init_decoder.c",
+                "external/opus/silk/lin2log.c",
+                "external/opus/silk/log2lin.c",
+                "external/opus/silk/LPC_analysis_filter.c",
+                "external/opus/silk/LPC_fit.c",
+                "external/opus/silk/LPC_inv_pred_gain.c",
+                "external/opus/silk/NLSF_decode.c",
+                "external/opus/silk/NLSF_stabilize.c",
+                "external/opus/silk/NLSF_unpack.c",
+                "external/opus/silk/NLSF2A.c",
+                "external/opus/silk/pitch_est_tables.c",
+                "external/opus/silk/PLC.c",
+                "external/opus/silk/resampler.c",
+                "external/opus/silk/resampler_private_AR2.c",
+                "external/opus/silk/resampler_private_down_FIR.c",
+                "external/opus/silk/resampler_private_IIR_FIR.c",
+                "external/opus/silk/resampler_private_up2_HQ.c",
+                "external/opus/silk/resampler_rom.c",
+                "external/opus/silk/shell_coder.c",
+                "external/opus/silk/sort.c",
+                "external/opus/silk/stereo_decode_pred.c",
+                "external/opus/silk/stereo_MS_to_LR.c",
+                "external/opus/silk/sum_sqr_shift.c",
+                "external/opus/silk/table_LSF_cos.c",
+                "external/opus/silk/tables_gain.c",
+                "external/opus/silk/tables_LTP.c",
+                "external/opus/silk/tables_NLSF_CB_NB_MB.c",
+                "external/opus/silk/tables_NLSF_CB_WB.c",
+                "external/opus/silk/tables_other.c",
+                "external/opus/silk/tables_pitch_lag.c",
+                "external/opus/silk/tables_pulses_per_block.c",
+
+                "external/opusfile/src/info.c",
+                "external/opusfile/src/internal.c",
+                "external/opusfile/src/opusfile.c",
+                "external/opusfile/src/stream.c",
+
+                "external/vorbis/lib/bitrate.c",
+                "external/vorbis/lib/block.c",
+                "external/vorbis/lib/codebook.c",
+                "external/vorbis/lib/envelope.c",
+                "external/vorbis/lib/floor0.c",
+                "external/vorbis/lib/floor1.c",
+                "external/vorbis/lib/info.c",
+                "external/vorbis/lib/lpc.c",
+                "external/vorbis/lib/lsp.c",
+                "external/vorbis/lib/mapping0.c",
+                "external/vorbis/lib/mdct.c",
+                "external/vorbis/lib/psy.c",
+                "external/vorbis/lib/registry.c",
+                "external/vorbis/lib/res0.c",
+                "external/vorbis/lib/sharedbook.c",
+                "external/vorbis/lib/smallft.c",
+                "external/vorbis/lib/synthesis.c",
+                "external/vorbis/lib/vorbisfile.c",
+                "external/vorbis/lib/window.c",
+            }
+            includedirs {
+                "external/ogg/include",
+                "external/opus/include",
+                "external/opus/celt",
+                "external/opus/silk",
+                "external/opusfile/include",
+                "external/vorbis/include",
+            }
+            defines {
+                "OPUS_BUILD", "USE_ALLOCA",
+                "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2",
+                "OPUS_HAVE_RTCD", "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2",
+            }
+        else
+            includedirs { OPUS_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR }
+        end
+    end
+
+    filter "system:linux"
+        links { "dl", "pthread", "m" }

resource/gframe/ygopro.rc

@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro"
 VALUE "LegalCopyright", "Copyright (C) 2023 Nanahira"
 VALUE "OriginalFilename", "ygopro.exe"
 VALUE "ProductName", "KoishiPro"
-VALUE "FileVersion", "Overdose"
-VALUE "ProductVersion", "Overdose"
+VALUE "FileVersion", "Bumblebee"
+VALUE "ProductVersion", "Bumblebee"
 END
 END
 BLOCK "VarFileInfo"

script @ 9f141e8c

-Subproject commit 28782ebd949a70081a9f3c5c867d12cba80e756d
+Subproject commit 9f141e8cdfc7adee127eaca1a7981e816b555ae3