2
0
Эх сурвалжийг харах

*** empty log message ***

Cary Sandvig 25 жил өмнө
parent
commit
8d11199064

+ 2 - 0
panda/src/audio/audio_pool.cxx

@@ -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 - 0
panda/src/audio/audio_win_traits.cxx

@@ -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;