Przeglądaj źródła

save to_os_specific in a temp string

Cary Sandvig 25 lat temu
rodzic
commit
2d00dbeecb
1 zmienionych plików z 5 dodań i 4 usunięć
  1. 5 4
      panda/src/audio/audio_win_traits.cxx

+ 5 - 4
panda/src/audio/audio_win_traits.cxx

@@ -362,7 +362,8 @@ WinSample* WinSample::load_wav(Filename filename) {
   UINT wavSize = 0;
   UINT wavSize = 0;
   BYTE* wavData = NULL;
   BYTE* wavData = NULL;
 
 
-  HRESULT result = wave_load(filename.to_os_specific().c_str(), wavInfo, wavData, wavSize);
+  string stmp = filename.to_os_specific();
+  HRESULT result = wave_load(stmp.c_str(), wavInfo, wavData, wavSize);
   if (FAILED(result)) {
   if (FAILED(result)) {
     if (wavData)
     if (wavData)
       delete [] wavData;
       delete [] wavData;
@@ -622,9 +623,9 @@ WinMusic* WinMusic::load_midi(Filename filename) {
     return ret;
     return ret;
   }
   }
 */
 */
-  MULTI_TO_WIDE(fdesc.wszFileName, filename.to_os_specific().c_str());
-  audio_cat->debug() << "os_specific name '" << filename.to_os_specific()
-		     << "'" << endl;
+  string stmp = filename.to_os_specific();
+  MULTI_TO_WIDE(fdesc.wszFileName, stmp.c_str());
+  audio_cat->debug() << "os_specific name '" << stmp << "'" << endl;
   if (filename.is_local()) {
   if (filename.is_local()) {
     fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME;
     fdesc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME;
     audio_cat->debug() << "is local" << endl;
     audio_cat->debug() << "is local" << endl;