diff options
| author | Ray <[email protected]> | 2017-05-16 00:20:17 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-05-16 00:20:17 +0200 |
| commit | f8a4498a242e685e528bd1ac6d84378947daff7d (patch) | |
| tree | fd4e83886e52c8aca3b9c5d9586a338546f2044e /src/audio.c | |
| parent | 1ed3d3285f1c1f6a01e0588ec46a177c84b864f5 (diff) | |
| parent | 65e6a6db53552fa241e81ae52b4258f7969b8771 (diff) | |
| download | raylib-f8a4498a242e685e528bd1ac6d84378947daff7d.tar.gz raylib-f8a4498a242e685e528bd1ac6d84378947daff7d.zip | |
Merge pull request #286 from raysan5/develop
Integrate develop branch
Diffstat (limited to 'src/audio.c')
| -rw-r--r-- | src/audio.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/audio.c b/src/audio.c index 3005586f..b81d5572 100644 --- a/src/audio.c +++ b/src/audio.c @@ -797,7 +797,11 @@ void ResumeMusicStream(Music music) ALenum state; alGetSourcei(music->stream.source, AL_SOURCE_STATE, &state); - if (state == AL_PAUSED) alSourcePlay(music->stream.source); + if (state == AL_PAUSED) + { + TraceLog(INFO, "[AUD ID %i] Resume music stream playing", music->stream.source); + alSourcePlay(music->stream.source); + } } // Stop music playing (close stream) @@ -813,8 +817,6 @@ void StopMusicStream(Music music) for (int i = 0; i < MAX_STREAM_BUFFERS; i++) { - - //UpdateAudioStream(music->stream, pcm, AUDIO_BUFFER_SIZE); // Update one buffer at a time alBufferData(music->stream.buffers[i], music->stream.format, pcm, AUDIO_BUFFER_SIZE*music->stream.sampleSize/8*music->stream.channels, music->stream.sampleRate); } @@ -853,7 +855,7 @@ void UpdateMusicStream(Music music) if (processed > 0) { - bool active = true; + bool streamEnding = false; // NOTE: Using dynamic allocation because it could require more than 16KB void *pcm = calloc(AUDIO_BUFFER_SIZE*music->stream.sampleSize/8*music->stream.channels, 1); @@ -898,7 +900,7 @@ void UpdateMusicStream(Music music) if (music->samplesLeft <= 0) { - active = false; + streamEnding = true; break; } } @@ -907,7 +909,7 @@ void UpdateMusicStream(Music music) free(pcm); // Reset audio stream for looping - if (!active) + if (streamEnding) { StopMusicStream(music); // Stop music (and reset) |