TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix Linux compile error

Browse Source
This commit is contained in:
rdb 2013-08-29 13:12:36 +00:00
parent 5a82dc9b1f
commit e5c4c10e20
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/movies/wavAudioCursor.cxx
View File

@ -298,7 +298,7 @@ WavAudioCursor::
void WavAudioCursor:: void WavAudioCursor::
seek(double t) { seek(double t) {
t = max(t, 0.0); t = max(t, 0.0);
streampos pos = _data_start + (streampos) min(t * _byte_rate, _data_size); streampos pos = _data_start + min((size_t) (t * _byte_rate), _data_size);
if (_can_seek_fast) { if (_can_seek_fast) {
_stream->seekg(pos); _stream->seekg(pos);
@ -338,7 +338,7 @@ seek(double t) {
void WavAudioCursor:: void WavAudioCursor::
read_samples(int n, PN_int16 *data) { read_samples(int n, PN_int16 *data) {
int desired = n * _audio_channels; int desired = n * _audio_channels;
int read_samples = min(desired, (_data_size - _data_pos) / _bytes_per_sample); int read_samples = min(desired, ((int) (_data_size - _data_pos)) / _bytes_per_sample);
if (read_samples <= 0) { if (read_samples <= 0) {
return; return;