cleaned up calculations

This commit is contained in:
Joshua Reisenauer 2016-04-24 22:00:40 -07:00
parent cb05c51911
commit 1c370f5a17

View file

@ -676,9 +676,9 @@ float GetMusicTimePlayed(void)
float secondsPlayed; float secondsPlayed;
if (currentMusic.chipTune) if (currentMusic.chipTune)
{ {
uint64_t* samples; uint64_t samples;
jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, samples); // Unsure if this is the desired value jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, &samples); // Unsure if this is the desired value
secondsPlayed = (float)samples; secondsPlayed = (float)samples / (currentMusic.sampleRate * currentMusic.channels);
} }
else else
{ {
@ -711,7 +711,7 @@ static bool BufferMusicStream(ALuint buffer)
{ {
if (currentMusic.chipTune) 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. 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 else