Skip to content

Y
ygopro
Commit 1356b833 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'patch-miniaudio' into develop

parents 0b58a83a 4681cd05
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
gframe/sound_manager.cpp
View file @ 1356b833
...@@ -40,7 +40,6 @@ void SoundManager::RefershBGMDir(std::wstring path, int scene) { ...@@ -40,7 +40,6 @@ void SoundManager::RefershBGMDir(std::wstring path, int scene) {
std::wstring filename = path + L"/" + name; std::wstring filename = path + L"/" + name;
BGMList[BGM_ALL].push_back(filename); BGMList[BGM_ALL].push_back(filename);
BGMList[scene].push_back(filename); BGMList[scene].push_back(filename);
printf("Found BGM %ls in scene %d\n", filename.c_str(), scene);
} }
}); });
} }
...@@ -225,7 +224,6 @@ void SoundManager::PlayMusic(char* song, bool loop) { ...@@ -225,7 +224,6 @@ void SoundManager::PlayMusic(char* song, bool loop) {
ma_sound_init_from_file_w(&engineMusic, song_w, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM); ma_sound_init_from_file_w(&engineMusic, song_w, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
#else #else
auto res = 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 #endif
ma_sound_set_looping(&soundBGM, loop); ma_sound_set_looping(&soundBGM, loop);
ma_sound_start(&soundBGM); ma_sound_start(&soundBGM);
...@@ -249,7 +247,6 @@ void SoundManager::PlayBGM(int scene) { ...@@ -249,7 +247,6 @@ void SoundManager::PlayBGM(int scene) {
wchar_t fname[1024]; wchar_t fname[1024];
myswprintf(fname, L"./sound/BGM/%ls", name); myswprintf(fname, L"./sound/BGM/%ls", name);
BufferIO::EncodeUTF8(fname, BGMName); BufferIO::EncodeUTF8(fname, BGMName);
printf("Playing BGM %s in scene %d\n", BGMName, scene);
PlayMusic(BGMName, false); PlayMusic(BGMName, false);
} }
#endif #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