Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #28 from fluddokt/omaster

Browse Source 
Attempt to fix jitter by using a higher precision timer.
This commit is contained in:
Jeffrey Han 2015-03-06 02:41:32 -05:00
commit 7fb326d870
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/org/newdawn/slick/openal/OpenALStreamPlayer.java
View File

@ -34,6 +34,7 @@ import java.nio.ByteBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import org.lwjgl.Sys;
import org.lwjgl.openal.AL10; import org.lwjgl.openal.AL10;
import org.lwjgl.openal.OpenALException; import org.lwjgl.openal.OpenALException;
import org.newdawn.slick.util.Log; import org.newdawn.slick.util.Log;
@ -96,7 +97,7 @@ public class OpenALStreamPlayer {
long musicLength = -1; long musicLength = -1;
/** The time of the last update, in ms. */ /** The time of the last update, in ms. */
long lastUpdateTime = System.currentTimeMillis(); long lastUpdateTime = getTime();
/** The offset time. */ /** The offset time. */
long offsetTime = 0; long offsetTime = 0;
@ -241,7 +242,7 @@ public class OpenALStreamPlayer {
int bufferLength = AL10.alGetBufferi(bufferIndex, AL10.AL_SIZE); int bufferLength = AL10.alGetBufferi(bufferIndex, AL10.AL_SIZE);
playedPos += bufferLength; playedPos += bufferLength;
lastUpdateTime = System.currentTimeMillis(); lastUpdateTime = getTime();
if (musicLength > 0 && playedPos > musicLength) if (musicLength > 0 && playedPos > musicLength)
playedPos -= musicLength; playedPos -= musicLength;
@ -365,7 +366,7 @@ public class OpenALStreamPlayer {
AL10.alSourceQueueBuffers(source, bufferNames); AL10.alSourceQueueBuffers(source, bufferNames);
AL10.alSourcePlay(source); AL10.alSourcePlay(source);
lastUpdateTime = System.currentTimeMillis(); lastUpdateTime = getTime();
} }
/** /**
@ -375,7 +376,7 @@ public class OpenALStreamPlayer {
*/ */
public float getPosition() { public float getPosition() {
float playedTime = ((float) playedPos / (float) sampleSize) / sampleRate; float playedTime = ((float) playedPos / (float) sampleSize) / sampleRate;
float timePosition = playedTime + (System.currentTimeMillis() - lastUpdateTime) / 1000f; float timePosition = playedTime + (getTime() - lastUpdateTime) / 1000f;
// + AL10.alGetSourcef(source, AL11.AL_SEC_OFFSET); // + AL10.alGetSourcef(source, AL11.AL_SEC_OFFSET);
return timePosition; return timePosition;
} }
@ -384,14 +385,24 @@ public class OpenALStreamPlayer {
* Processes a track pause. * Processes a track pause.
*/ */
public void pausing() { public void pausing() {
offsetTime = System.currentTimeMillis() - lastUpdateTime; offsetTime = getTime() - lastUpdateTime;
} }
/** /**
* Processes a track resume. * Processes a track resume.
*/ */
public void resuming() { public void resuming() {
lastUpdateTime = System.currentTimeMillis() - offsetTime; lastUpdateTime = getTime() - offsetTime;
}
/**
* http://wiki.lwjgl.org/index.php?title=LWJGL_Basics_4_%28Timing%29
* Get the time in milliseconds
*
* @return The system time in milliseconds
*/
public long getTime() {
return (Sys.getTime() * 1000) / Sys.getTimerResolution();
} }
/** /**