Browse Source

Fixes for linux

Josh Yelon 19 years ago
parent
commit
e8606c82af

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

@@ -49,7 +49,7 @@ pset<FmodAudioManager *> FmodAudioManager::_all_managers;
 // Central dispatcher for audio errors.
 ////////////////////////////////////////////////////////////////////
 
-static void fmod_audio_errcheck(FMOD_RESULT result) {
+void fmod_audio_errcheck(FMOD_RESULT result) {
   if (result != 0) {
     audio_error("FMOD Error: "<< FMOD_ErrorString(result) );
   }

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

@@ -148,11 +148,11 @@ play() {
 //  Description: When fmod finishes playing a sound, decrements the
 //               reference count of the associated FmodAudioSound.
 ////////////////////////////////////////////////////////////////////
-static FMOD_RESULT F_CALLBACK sound_end_callback(FMOD_CHANNEL *  channel, 
-                                                 FMOD_CHANNEL_CALLBACKTYPE  type, 
-                                                 int  command, 
-                                                 unsigned int  commanddata1, 
-                                                 unsigned int  commanddata2) {
+FMOD_RESULT F_CALLBACK sound_end_callback(FMOD_CHANNEL *  channel, 
+					  FMOD_CHANNEL_CALLBACKTYPE  type, 
+					  int  command, 
+					  unsigned int  commanddata1, 
+					  unsigned int  commanddata2) {
   FmodAudioSound *fsound = (FmodAudioSound*)command;
   fsound->unref();
   return FMOD_OK;
@@ -287,7 +287,7 @@ set_time(float start_time) {
   FMOD_RESULT result;
   bool playing;
 
-  int startTime = start_time * 1000;
+  int startTime = (int)(start_time * 1000);
 
   if (_channel != 0) {
     // try backing up current sound.