From e8606c82afebd32283a34abfb144240dd56b9d22 Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Thu, 26 Oct 2006 20:40:58 +0000 Subject: [PATCH] Fixes for linux --- panda/src/audiotraits/fmodAudioManager.cxx | 2 +- panda/src/audiotraits/fmodAudioSound.cxx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/panda/src/audiotraits/fmodAudioManager.cxx b/panda/src/audiotraits/fmodAudioManager.cxx index 704d98c77c..840de0e9ce 100644 --- a/panda/src/audiotraits/fmodAudioManager.cxx +++ b/panda/src/audiotraits/fmodAudioManager.cxx @@ -49,7 +49,7 @@ pset 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) ); } diff --git a/panda/src/audiotraits/fmodAudioSound.cxx b/panda/src/audiotraits/fmodAudioSound.cxx index d1bd3ede86..a41e1c49e5 100644 --- a/panda/src/audiotraits/fmodAudioSound.cxx +++ b/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.