TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

make sound path work for loading MIDI

Browse Source
This commit is contained in:
Cary Sandvig 2000-11-03 19:39:03 +00:00
parent efdb07d62f
commit eff4158f0e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,6 +595,7 @@ WinMusic* WinMusic::load_midi(Filename filename) {
char szDir[_MAX_PATH]; char szDir[_MAX_PATH];
WCHAR wszDir[_MAX_PATH]; WCHAR wszDir[_MAX_PATH];
/*
if (_getcwd(szDir, _MAX_PATH)==NULL) { if (_getcwd(szDir, _MAX_PATH)==NULL) {
audio_cat->error() << "could not getcwd" << endl; audio_cat->error() << "could not getcwd" << endl;
delete ret; delete ret;
@ -609,14 +610,23 @@ WinMusic* WinMusic::load_midi(Filename filename) {
ret = (WinMusic*)0L; ret = (WinMusic*)0L;
return ret; return ret;
} }
*/
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.to_os_specific().c_str(), fdesc.wszFileName); // MULTI_TO_WIDE(filename.to_os_specific().c_str(), fdesc.wszFileName);
if (!(filename.resolve_filename(get_sound_path()))) {
audio_cat->error() << "could not find '" << filename << "' on sound path"
<< endl;
loader->Release();
delete ret;
ret = (WinMusic*)0L;
return ret;
}
MULTI_TO_WIDE(fdesc.wszFileName, filename.to_os_specific().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,
(void**)&(ret->_music)); (void**)&(ret->_music));
if (FAILED(result)) { if (FAILED(result)) {