From 6e23b43ef322bde26b4a8c1bfe90c9a70623fb27 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 7 Feb 2003 15:29:50 +0000 Subject: [PATCH] remove compiler warnings on gcc --- panda/src/audiotraits/fmodAudioSound.cxx | 3 +-- panda/src/audiotraits/fmodAudioSound.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/panda/src/audiotraits/fmodAudioSound.cxx b/panda/src/audiotraits/fmodAudioSound.cxx index 636608ab63..dcc3f230f2 100644 --- a/panda/src/audiotraits/fmodAudioSound.cxx +++ b/panda/src/audiotraits/fmodAudioSound.cxx @@ -69,7 +69,6 @@ play() { // Play the stream, but start it paused so we can set the volume and // panning first. - bool bStatusOK = false; assert(_audio != NULL); _channel = FSOUND_Stream_PlayEx(FSOUND_FREE, _audio, NULL, 1); if (_channel == -1) { @@ -134,7 +133,7 @@ void FmodAudioSound::set_time(float start_time) { start_time = _length - 0.01; } // FMOD measures time in milliseconds, so scale up by 1000. - FSOUND_Stream_SetTime(_audio, start_time * 1000.0f); + FSOUND_Stream_SetTime(_audio, (int)(start_time * 1000.0f)); } float FmodAudioSound::get_time() const { diff --git a/panda/src/audiotraits/fmodAudioSound.h b/panda/src/audiotraits/fmodAudioSound.h index 105ce02a2f..ae401a1fba 100644 --- a/panda/src/audiotraits/fmodAudioSound.h +++ b/panda/src/audiotraits/fmodAudioSound.h @@ -80,13 +80,13 @@ public: protected: private: - FSOUND_STREAM *_audio; PT(FmodAudioManager) _manager; + FSOUND_STREAM *_audio; + string _file_name; float _volume; // 0..1.0 float _balance; // -1..1 - mutable float _length; // in seconds. unsigned long _loop_count; - string _file_name; + mutable float _length; // in seconds. bool _active; bool _paused; int _channel;