diff options
| author | Ray <[email protected]> | 2016-11-15 18:00:02 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-11-15 18:00:02 +0100 |
| commit | 4123233f7873cf157c92f4990e56b83da47b9d7f (patch) | |
| tree | 95a52d661abc832c8c30095b2c4c661cf52ae30f /src/audio.c | |
| parent | a9315fc422a3a036891f50f0c2be5059c3db8b31 (diff) | |
| parent | a3d71dd58d993d15d695b0cd58b434ef2604185b (diff) | |
| download | raylib-4123233f7873cf157c92f4990e56b83da47b9d7f.tar.gz raylib-4123233f7873cf157c92f4990e56b83da47b9d7f.zip | |
Merge pull request #192 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'src/audio.c')
| -rw-r--r-- | src/audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio.c b/src/audio.c index 9d2eeb47..3684e10a 100644 --- a/src/audio.c +++ b/src/audio.c @@ -706,7 +706,7 @@ Music LoadMusicStream(const char *fileName) else { music->stream = InitAudioStream(music->ctxFlac->sampleRate, music->ctxFlac->bitsPerSample, music->ctxFlac->channels); - music->totalSamples = music->ctxFlac->totalSampleCount; + music->totalSamples = (unsigned int)music->ctxFlac->totalSampleCount; music->samplesLeft = music->totalSamples; music->ctxType = MUSIC_AUDIO_FLAC; music->loop = true; // We loop by default @@ -853,7 +853,7 @@ void UpdateMusicStream(Music music) int pcmi[AUDIO_BUFFER_SIZE]; // NOTE: Returns the number of samples to process (should be the same as numSamples) - int numSamplesFlac = drflac_read_s32(music->ctxFlac, numSamples, pcmi); + unsigned int numSamplesFlac = (unsigned int)drflac_read_s32(music->ctxFlac, numSamples, pcmi); UpdateAudioStream(music->stream, pcmi, numSamplesFlac*music->stream.channels); music->samplesLeft -= (numSamples*music->stream.channels); @@ -1237,7 +1237,7 @@ static Wave LoadOGG(const char *fileName) if (totalSeconds > 10) TraceLog(WARNING, "[%s] Ogg audio lenght is larger than 10 seconds (%f), that's a big file in memory, consider music streaming", fileName, totalSeconds); - int totalSamples = totalSeconds*info.sample_rate*info.channels; + int totalSamples = (int)(totalSeconds*info.sample_rate*info.channels); wave.sampleCount = totalSamples; wave.data = (short *)malloc(totalSamplesLength*sizeof(short)); |
