TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

hmm, reevaluate load_from_mem

Browse Source
This commit is contained in:
David Rose 2002-08-06 17:38:06 +00:00
parent 966bf9a566
commit a304976e9b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/audiotraits/milesAudioManager.cxx
View File

@ -171,6 +171,8 @@ HAUDIO MilesAudioManager::
load(Filename file_name) { load(Filename file_name) {
HAUDIO audio; HAUDIO audio;
/*
// This is broken for some reason.
if (use_vfs) { if (use_vfs) {
VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr(); VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
audio_debug(" vfs load \"" << file_name << "\""); audio_debug(" vfs load \"" << file_name << "\"");
@ -178,7 +180,7 @@ load(Filename file_name) {
vfs->read_file(file_name, audio_data); vfs->read_file(file_name, audio_data);
audio = AIL_quick_load_mem(audio_data.data(), audio_data.size()); audio = AIL_quick_load_mem(audio_data.data(), audio_data.size());
} else { } else */ {
string stmp = file_name.to_os_specific(); string stmp = file_name.to_os_specific();
audio_debug(" \"" << stmp << "\""); audio_debug(" \"" << stmp << "\"");
audio = AIL_quick_load(stmp.c_str()); audio = AIL_quick_load(stmp.c_str());