Browse Source

Fixed fmod looping bug again

Josh Yelon 18 years ago
parent
commit
fc25635bbc

+ 1 - 1
panda/src/audiotraits/fmodAudioSound.cxx

@@ -119,8 +119,8 @@ FmodAudioSound(AudioManager *manager, Filename file_name, bool positional) {
 
 
   // Some WAV files contain a loop bit.  This is not handled
   // Some WAV files contain a loop bit.  This is not handled
   // consistently.  Override it.
   // consistently.  Override it.
-  _sound->setMode(FMOD_LOOP_OFF);
   _sound->setLoopCount(-1);
   _sound->setLoopCount(-1);
+  _sound->setMode(FMOD_LOOP_OFF);
   
   
   //This is just to collect the defaults of the sound, so we don't
   //This is just to collect the defaults of the sound, so we don't
   //Have to query FMOD everytime for the info.
   //Have to query FMOD everytime for the info.

+ 2 - 0
panda/src/glxdisplay/glxGraphicsWindow.cxx

@@ -1082,6 +1082,8 @@ open_raw_mice()
 	  GraphicsWindowInputDevice device =
 	  GraphicsWindowInputDevice device =
 	    GraphicsWindowInputDevice::pointer_only(full_id);
 	    GraphicsWindowInputDevice::pointer_only(full_id);
 	  _input_devices.push_back(device);
 	  _input_devices.push_back(device);
+	  glxdisplay_cat.info() << "Raw mouse " <<
+	    inf._input_device_index << " detected: " << full_id << "\n";
 	  any_mice = true;
 	  any_mice = true;
 	} else {
 	} else {
 	  close(fd);
 	  close(fd);