Skip to content

Y
ygopro
Commit 2ffeca16 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'sound' into test

parents 49646890 5a9a840e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
gframe/sound_manager.cpp
View file @ 2ffeca16
#include "sound_manager.h" #include "sound_manager.h"
#ifndef _WIN32
#include <dirent.h>
#endif
namespace ygo { namespace ygo {
...@@ -14,7 +17,6 @@ bool SoundManager::Init() { ...@@ -14,7 +17,6 @@ bool SoundManager::Init() {
return false; return false;
} else { } else {
#ifdef IRRKLANG_STATIC #ifdef IRRKLANG_STATIC
irrklang::ikpMP3Init(engineSound);
irrklang::ikpMP3Init(engineMusic); irrklang::ikpMP3Init(engineMusic);
#endif #endif
return true; return true;
...@@ -49,13 +51,14 @@ void SoundManager::RefershBGMDir(std::wstring path, int scene) { ...@@ -49,13 +51,14 @@ void SoundManager::RefershBGMDir(std::wstring path, int scene) {
} while(FindNextFileW(fh, &fdataw)); } while(FindNextFileW(fh, &fdataw));
FindClose(fh); FindClose(fh);
#else #else
// not fully implemented
DIR * dir; DIR * dir;
struct dirent * dirp; struct dirent * dirp;
if((dir = opendir("./sound/BGM/*.mp3")) == NULL) if((dir = opendir("./sound/BGM/*.ogg")) == NULL)
return; return;
while((dirp = readdir(dir)) != NULL) { while((dirp = readdir(dir)) != NULL) {
size_t len = strlen(dirp->d_name); size_t len = strlen(dirp->d_name);
if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".mp3") != 0) if(len < 5 || strcasecmp(dirp->d_name + len - 4, ".ogg") != 0)
continue; continue;
wchar_t wname[256]; wchar_t wname[256];
BufferIO::DecodeUTF8(dirp->d_name, wname); BufferIO::DecodeUTF8(dirp->d_name, wname);
......
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