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

*** empty log message ***

Browse Source
This commit is contained in:
Cary Sandvig 2000-11-29 22:36:53 +00:00
parent d7ef955fb4
commit 8d11199064
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/audio/audio_pool.cxx
View File

@ -60,6 +60,8 @@ AudioSound* AudioPool::ns_load_sound(Filename filename) {
if (audio_cat->is_debug()) if (audio_cat->is_debug())
audio_cat->debug() << "in AudioPool::ns_load_sound" << endl; audio_cat->debug() << "in AudioPool::ns_load_sound" << endl;
filename.resolve_filename(get_sound_path()); filename.resolve_filename(get_sound_path());
if (audio_cat->is_debug())
audio_cat->debug() << "resolved filename is '" << filename << "'" << endl;
SoundMap::const_iterator si; SoundMap::const_iterator si;
si = _sounds.find(filename); si = _sounds.find(filename);

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

@ -620,6 +620,7 @@ WinMusic* WinMusic::load_midi(Filename filename) {
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()))) { if (!(filename.resolve_filename(get_sound_path()))) {
audio_cat->error() << "could not find '" << filename << "' on sound path" audio_cat->error() << "could not find '" << filename << "' on sound path"
<< endl; << endl;
@ -628,6 +629,7 @@ WinMusic* WinMusic::load_midi(Filename filename) {
ret = (WinMusic*)0L; ret = (WinMusic*)0L;
return ret; return ret;
} }
*/
MULTI_TO_WIDE(fdesc.wszFileName, filename.to_os_specific().c_str()); MULTI_TO_WIDE(fdesc.wszFileName, filename.to_os_specific().c_str());
if (filename.is_local()) if (filename.is_local())
fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME; fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME;