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

Insignificant whitespace changes from #44.

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-03-11 00:37:57 -04:00
parent 4fc27eb0d0
commit 65c50771ac
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,6 @@ import org.lwjgl.openal.OpenALException;
import org.newdawn.slick.util.Log; import org.newdawn.slick.util.Log;
import org.newdawn.slick.util.ResourceLoader; import org.newdawn.slick.util.ResourceLoader;
/** /**
* A generic tool to work on a supplied stream, pulling out PCM data and buffered it to OpenAL * A generic tool to work on a supplied stream, pulling out PCM data and buffered it to OpenAL
* as required. * as required.
@ -98,20 +97,18 @@ public class OpenALStreamPlayer {
/** The music length. */ /** The music length. */
long musicLength = -1; long musicLength = -1;
/** The assumed time of when the music position would be 0. */
/** The assumed time of when the music position would be 0 */
long syncStartTime; long syncStartTime;
/** The last value that was returned the music position */ /** The last value that was returned for the music position. */
float lastUpdatePosition = 0; float lastUpdatePosition = 0;
/** The average difference between the sync time and the music position */ /** The average difference between the sync time and the music position. */
float avgDiff; float avgDiff;
/** The time when it was paused */ /** The time when the music was paused. */
long pauseTime; long pauseTime;
/** /**
* Create a new player to work on an audio stream * Create a new player to work on an audio stream
* *
@ -357,7 +354,7 @@ public class OpenALStreamPlayer {
} }
playedPos = streamPos; playedPos = streamPos;
syncStartTime = getTime() - playedPos*1000/sampleSize/sampleRate; syncStartTime = getTime() - playedPos * 1000 / sampleSize / sampleRate;
startPlayback(); startPlayback();
@ -408,7 +405,7 @@ public class OpenALStreamPlayer {
float dxPosition = thisPosition - lastUpdatePosition; float dxPosition = thisPosition - lastUpdatePosition;
long dxTime = thisTime - syncStartTime; long dxTime = thisTime - syncStartTime;
//hard reset // hard reset
if (Math.abs(thisPosition - dxTime / 1000f) > 1 / 2f) { if (Math.abs(thisPosition - dxTime / 1000f) > 1 / 2f) {
syncStartTime = thisTime - ((long) (thisPosition * 1000)); syncStartTime = thisTime - ((long) (thisPosition * 1000));
dxTime = thisTime - syncStartTime; dxTime = thisTime - syncStartTime;
@ -421,9 +418,10 @@ public class OpenALStreamPlayer {
dxTime = thisTime - syncStartTime; dxTime = thisTime - syncStartTime;
lastUpdatePosition = thisPosition; lastUpdatePosition = thisPosition;
} }
return dxTime / 1000f; return dxTime / 1000f;
} }
/** /**
* Processes a track pause. * Processes a track pause.
*/ */