TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove compiler warnings on gcc

Browse Source
This commit is contained in:
David Rose 2003-02-07 15:29:50 +00:00
parent 4d5536aad3
commit 6e23b43ef3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/audiotraits/fmodAudioSound.cxx
View File

@ -69,7 +69,6 @@ play() {
// Play the stream, but start it paused so we can set the volume and // Play the stream, but start it paused so we can set the volume and
// panning first. // panning first.
bool bStatusOK = false;
assert(_audio != NULL); assert(_audio != NULL);
_channel = FSOUND_Stream_PlayEx(FSOUND_FREE, _audio, NULL, 1); _channel = FSOUND_Stream_PlayEx(FSOUND_FREE, _audio, NULL, 1);
if (_channel == -1) { if (_channel == -1) {
@ -134,7 +133,7 @@ void FmodAudioSound::set_time(float start_time) {
start_time = _length - 0.01; start_time = _length - 0.01;
} }
// FMOD measures time in milliseconds, so scale up by 1000. // 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 { float FmodAudioSound::get_time() const {

6
panda/src/audiotraits/fmodAudioSound.h
View File

@ -80,13 +80,13 @@ public:
protected: protected:
private: private:
FSOUND_STREAM *_audio;
PT(FmodAudioManager) _manager; PT(FmodAudioManager) _manager;
FSOUND_STREAM *_audio;
string _file_name;
float _volume; // 0..1.0 float _volume; // 0..1.0
float _balance; // -1..1 float _balance; // -1..1
mutable float _length; // in seconds.
unsigned long _loop_count; unsigned long _loop_count;
string _file_name; mutable float _length; // in seconds.
bool _active; bool _active;
bool _paused; bool _paused;
int _channel; int _channel;