aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoshua Reisenauer <kd7tck@msn.com>2016-04-24 22:00:40 -0700
committerJoshua Reisenauer <kd7tck@msn.com>2016-04-24 22:00:40 -0700
commit1c370f5a179ab956d90d80e5a3b566ab14027557 (patch)
treedbaf24bffb08bb6109f0e8c2ba11189da1206cd9 /src
parentcb05c51911fdc885c8e91e51cbaa2ab32e114c7b (diff)
downloadraylib-1c370f5a179ab956d90d80e5a3b566ab14027557.tar.gz
raylib-1c370f5a179ab956d90d80e5a3b566ab14027557.zip
cleaned up calculations
Diffstat (limited to 'src')
-rw-r--r--src/audio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio.c b/src/audio.c
index e5bd6819..b8657336 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -676,9 +676,9 @@ float GetMusicTimePlayed(void)
float secondsPlayed;
if (currentMusic.chipTune)
{
- uint64_t* samples;
- jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, samples); // Unsure if this is the desired value
- secondsPlayed = (float)samples;
+ uint64_t samples;
+ jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, &samples); // Unsure if this is the desired value
+ secondsPlayed = (float)samples / (currentMusic.sampleRate * currentMusic.channels);
}
else
{
@@ -711,7 +711,7 @@ static bool BufferMusicStream(ALuint buffer)
{
if (currentMusic.chipTune)
{
- jar_xm_generate_samples(currentMusic.chipctx, pcm + size, (MUSIC_BUFFER_SIZE - size)/2);
+ jar_xm_generate_samples(currentMusic.chipctx, pcm + size, (MUSIC_BUFFER_SIZE - size) / 2);
streamedBytes = (MUSIC_BUFFER_SIZE - size)/2; // There is no end of stream for xmfiles, once the end is reached zeros are generated for non looped chiptunes.
}
else