Commit 0e5806a2 authored by nanahira's avatar nanahira

add stb_vorbis for ogg support

parent 688ed25c
......@@ -2,5 +2,7 @@ project "cminiaudio"
kind "StaticLib"
files { "*.c", "*.h" }
forceincludes { "./stb_vorbis.h" }
filter "system:linux"
links { "dl", "pthread", "m" }
This diff is collapsed.
This diff is collapsed.
......@@ -40,6 +40,7 @@ void SoundManager::RefershBGMDir(std::wstring path, int scene) {
std::wstring filename = path + L"/" + name;
BGMList[BGM_ALL].push_back(filename);
BGMList[scene].push_back(filename);
printf("Found BGM %ls in scene %d\n", filename.c_str(), scene);
}
});
}
......@@ -223,7 +224,8 @@ void SoundManager::PlayMusic(char* song, bool loop) {
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
ma_sound_init_from_file(&engineMusic, song, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
auto res = ma_sound_init_from_file(&engineMusic, song, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
printf("res = %d\n", res);
#endif
ma_sound_set_looping(&soundBGM, loop);
ma_sound_start(&soundBGM);
......@@ -247,6 +249,7 @@ void SoundManager::PlayBGM(int scene) {
wchar_t fname[1024];
myswprintf(fname, L"./sound/BGM/%ls", name);
BufferIO::EncodeUTF8(fname, BGMName);
printf("Playing BGM %s in scene %d\n", BGMName, scene);
PlayMusic(BGMName, false);
}
#endif
......
......@@ -4,7 +4,6 @@
#include "game.h"
#include "../ocgcore/mtrandom.h"
#ifdef YGOPRO_USE_AUDIO
#define MINIAUDIO_IMPLEMENTATION
#include "miniaudio/miniaudio.h"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment