Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed JSfx with JMOD.

Browse Source
This commit is contained in:
xawotihs
2013-12-29 18:37:26 +01:00
parent d98640fc01
commit 6fd136a211
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
JGE/src/pc/JSfx.cpp
View File

@@ -161,15 +161,16 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
if (music) if (music)
{ {
JFileSystem* fileSystem = JFileSystem::GetInstance(); JFileSystem* fileSystem = JFileSystem::GetInstance();
if (fileSystem->OpenFile(fileName)) JFile* jFile = fileSystem->OpenFile(fileName);
if (jFile)
{ {
int size = fileSystem->GetFileSize(); int size = fileSystem->GetFileSize(jFile);
char *buffer = new char[size]; char *buffer = new char[size];
fileSystem->ReadFile(buffer, size); fileSystem->ReadFile(jFile, buffer, size);
music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size); music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
delete[] buffer; delete[] buffer;
fileSystem->CloseFile(); fileSystem->CloseFile(jFile);
} }
} }
return music; return music;
@@ -281,15 +282,16 @@ JSample *JSoundSystem::LoadSample(const char *fileName)
if (sample) if (sample)
{ {
JFileSystem* fileSystem = JFileSystem::GetInstance(); JFileSystem* fileSystem = JFileSystem::GetInstance();
if (fileSystem->OpenFile(fileName)) JFile* jFile = fileSystem->OpenFile(fileName);
if (jFile)
{ {
int size = fileSystem->GetFileSize(); int size = fileSystem->GetFileSize(jFile);
char *buffer = new char[size]; char *buffer = new char[size];
fileSystem->ReadFile(buffer, size); fileSystem->ReadFile(jFile, buffer, size);
sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size); sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
delete[] buffer; delete[] buffer;
fileSystem->CloseFile(); fileSystem->CloseFile(jFile);
}else }else
sample->mSample = NULL; sample->mSample = NULL;