TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Joe Shochet 2000-10-25 19:01:53 +00:00
parent 79bc776db2
commit a85552458f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/audio/audio_win_traits.cxx
View File

@ -361,7 +361,7 @@ WinSample* WinSample::load_wav(Filename filename) {
UINT wavSize = 0; UINT wavSize = 0;
BYTE* wavData = NULL; BYTE* wavData = NULL;
HRESULT result = wave_load(filename.c_str(), wavInfo, wavData, wavSize); HRESULT result = wave_load(filename.to_os_specific().c_str(), wavInfo, wavData, wavSize);
if (FAILED(result)) { if (FAILED(result)) {
if (wavData) if (wavData)
delete [] wavData; delete [] wavData;
@ -613,8 +613,8 @@ WinMusic* WinMusic::load_midi(Filename filename) {
DMUS_OBJECTDESC fdesc; DMUS_OBJECTDESC fdesc;
fdesc.guidClass = CLSID_DirectMusicSegment; fdesc.guidClass = CLSID_DirectMusicSegment;
fdesc.dwSize = sizeof(DMUS_OBJECTDESC); fdesc.dwSize = sizeof(DMUS_OBJECTDESC);
// MULTI_TO_WIDE(filename.c_str(), fdesc.wszFileName); // MULTI_TO_WIDE(filename.to_os_specific().c_str(), fdesc.wszFileName);
MULTI_TO_WIDE(fdesc.wszFileName, filename.c_str()); MULTI_TO_WIDE(fdesc.wszFileName, filename.to_os_specific().c_str());
// fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH; // fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH;
fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME; fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME;
result = loader->GetObject(&fdesc, IID_IDirectMusicSegment2, result = loader->GetObject(&fdesc, IID_IDirectMusicSegment2,