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

Follow-up to #15.

Browse Source 
- Removed the temporary directory (Options.TMP_DIR), which is no longer needed.
- Excluded original Slick2D classes that were overridden in pom.xml.
- Formatting changes and documentation.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-02-12 03:52:19 -05:00
parent 800014ed4c
commit f6eec5cd6c
11 changed files with 321 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
/.opsu_tmp/
/Screenshots/
/Skins/
/SongPacks/

12
pom.xml
View File

@ -93,6 +93,18 @@
</excludes>
</artifactSet>
-->
<filters>
<filter>
<!-- Overwritten classes -->
<artifact>org.slick2d:slick2d-core</artifact>
<excludes>
<exclude>org/newdawn/slick/Music.*</exclude>
<exclude>org/newdawn/slick/openal/AudioInputStream*</exclude>
<exclude>org/newdawn/slick/openal/OpenALStreamPlayer*</exclude>
<exclude>org/newdawn/slick/openal/SoundStore*</exclude>
</excludes>
</filter>
</filters>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
<executions>

7
src/itdelatrisu/opsu/Opsu.java
View File

@ -134,13 +134,6 @@ public class Opsu extends StateBasedGame {
ResourceLoader.addResourceLocation(new FileSystemLocation(new File(".")));
ResourceLoader.addResourceLocation(new FileSystemLocation(new File("./res/")));
// clear the cache
if (!Options.TMP_DIR.mkdir()) {
for (File tmp : Options.TMP_DIR.listFiles())
tmp.delete();
}
Options.TMP_DIR.deleteOnExit();
// initialize score database
ScoreDB.init();

3
src/itdelatrisu/opsu/Options.java
View File

@ -42,9 +42,6 @@ import org.newdawn.slick.util.Log;
* Handles all user options.
*/
public class Options {
/** Temporary folder for file conversions, auto-deleted upon successful exit. */
public static final File TMP_DIR = new File(".opsu_tmp/");
/** File for logging errors. */
public static final File LOG_FILE = new File(".opsu.log");

57
src/itdelatrisu/opsu/audio/MusicController.java
View File

@ -27,8 +27,6 @@ import java.io.File;
import java.lang.reflect.Field;
import java.nio.IntBuffer;
import javazoom.jl.converter.Converter;
import org.lwjgl.BufferUtils;
import org.lwjgl.openal.AL;
import org.lwjgl.openal.AL10;
@ -48,9 +46,6 @@ public class MusicController {
/** The last OsuFile passed to play(). */
private static OsuFile lastOsu;
/** Temporary WAV file for file conversions (to be deleted). */
private static File wavFile;
/** Thread for loading tracks. */
private static Thread trackLoader;
@ -79,14 +74,6 @@ public class MusicController {
switch (OsuParser.getExtension(osu.audioFilename.getName())) {
case "ogg":
trackLoader = new Thread() {
@Override
public void run() {
loadTrack(osu.audioFilename, osu.previewTime, loop);
}
};
trackLoader.start();
break;
case "mp3":
trackLoader = new Thread() {
@Override
@ -108,7 +95,7 @@ public class MusicController {
*/
private static void loadTrack(File file, int previewTime, boolean loop) {
try { // create a new player
player = new Music(file.getPath(),true);
player = new Music(file.getPath(), true);
player.addListener(new MusicListener() {
@Override
public void musicEnded(Music music) { trackEnded = true; }
@ -135,27 +122,9 @@ public class MusicController {
else
player.play();
player.setPosition(position / 1000f);
}
}
/**
* Converts an MP3 file to a temporary WAV file.
*/
private static File convertMp3(File file) {
try {
wavFile = File.createTempFile(".osu", ".wav", Options.TMP_DIR);
wavFile.deleteOnExit();
Converter converter = new Converter();
converter.convert(file.getPath(), wavFile.getPath());
return wavFile;
} catch (Exception e) {
ErrorHandler.error(String.format("Failed to play file '%s'.", file.getAbsolutePath()), e, false);
}
return wavFile;
}
/**
* Returns true if a track is being loaded.
*/
@ -269,12 +238,9 @@ public class MusicController {
/**
* Plays the current track.
*/
public static boolean play() {
if (trackExists()){
public static void play() {
if (trackExists())
player.play();
return true;
}
return false;
}
/**
@ -328,17 +294,14 @@ public class MusicController {
* Stops the current track, cancels track conversions, erases
* temporary files, releases OpenAL sources, and resets state.
*/
@SuppressWarnings("deprecation")
public static void reset() {
stop();
// TODO: properly interrupt instead of using deprecated Thread.stop();
// interrupt the conversion/track loading
// Not sure if the interrupt does anything
// And the join kind of defeats the purpose of threading it.
// But is needed since bad things happen when OpenALStreamPlayer source is released asynchronously I think.
// interrupt the track loading
// TODO: Not sure if the interrupt does anything, and the join kind of
// defeats the purpose of threading it, but it is needed since bad things
// likely happen when OpenALStreamPlayer source is released asynchronously.
if (isTrackLoading()){
//trackLoader.stop();
trackLoader.interrupt();
try {
trackLoader.join();
@ -348,12 +311,6 @@ public class MusicController {
}
trackLoader = null;
// delete temporary WAV file
if (wavFile != null) {
wavFile.delete();
wavFile = null;
}
// reset state
lastOsu = null;
trackEnded = false;

3
src/itdelatrisu/opsu/states/Game.java
View File

@ -696,8 +696,7 @@ public class Game extends BasicGameState {
// reset game data
resetGameData();
//needs to play before we can set position
//so we can resume without lag later
// needs to play before setting position to resume without lag later
MusicController.play();
MusicController.setPosition(0);
MusicController.pause();

44
src/org/newdawn/slick/Music.java
View File

@ -1,15 +1,29 @@
/*
Copyright (c) 2013, Slick2D
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of the Slick2D nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <EFBFBD>gAS IS<EFBFBD>h AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Copyright (c) 2013, Slick2D
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* - Neither the name of the Slick2D nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.newdawn.slick;
@ -45,7 +59,7 @@ public class Music {
if (currentMusic != null) {
SoundStore.get().poll(delta);
if (!SoundStore.get().isMusicPlaying()) {
if (!currentMusic.positioning&&!currentMusic.playing) {
if (!currentMusic.positioning && !currentMusic.playing) {
Music oldMusic = currentMusic;
currentMusic = null;
oldMusic.fireMusicEnded();
@ -138,8 +152,7 @@ public class Music {
String ref = url.getFile();
try {
if (ref.toLowerCase().endsWith(".ogg")
||ref.toLowerCase().endsWith(".mp3")) {
if (ref.toLowerCase().endsWith(".ogg") || ref.toLowerCase().endsWith(".mp3")) {
if (streamingHint) {
sound = SoundStore.get().getOggStream(url);
} else {
@ -171,8 +184,7 @@ public class Music {
SoundStore.get().init();
try {
if (ref.toLowerCase().endsWith(".ogg")
||ref.toLowerCase().endsWith(".mp3")) {
if (ref.toLowerCase().endsWith(".ogg") || ref.toLowerCase().endsWith(".mp3")) {
if (streamingHint) {
sound = SoundStore.get().getOggStream(ref);
} else {

48
src/org/newdawn/slick/openal/AudioInputStream.java
View File

@ -1,16 +1,31 @@
/*
Copyright (c) 2013, Slick2D
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of the Slick2D nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <EFBFBD>gAS IS<EFBFBD>h AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Copyright (c) 2013, Slick2D
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* - Neither the name of the Slick2D nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.newdawn.slick.openal;
import java.io.IOException;
@ -82,6 +97,13 @@ interface AudioInputStream {
*/
public void close() throws IOException;
public long skip(long l) throws IOException;
/**
* Skips over and discards n bytes of data from this input stream.
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
* @throws IOException
* @see java.io.InputStream#skip(long)
*/
public long skip(long n) throws IOException;
}

234
src/org/newdawn/slick/openal/Mp3InputStream.java
View File

@ -1,176 +1,202 @@
/*
Copyright (c) 2013, Slick2D
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of the Slick2D nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <EFBFBD>gAS IS<EFBFBD>h AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Copyright (c) 2013, Slick2D
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* - Neither the name of the Slick2D nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.newdawn.slick.openal;
import java.io.IOException;
import java.io.InputStream;
import sun.font.EAttribute;
import javazoom.jl.decoder.*;
import javazoom.jl.decoder.Bitstream;
import javazoom.jl.decoder.BitstreamException;
import javazoom.jl.decoder.Decoder;
import javazoom.jl.decoder.DecoderException;
import javazoom.jl.decoder.Header;
import javazoom.jl.decoder.SampleBuffer;
import org.newdawn.slick.util.Log;
/**
* An input stream that can extract MP3 data.
*
* @author fluddokt (https://github.com/fluddokt)
*/
public class Mp3InputStream extends InputStream implements AudioInputStream {
/** The MPEG audio bitstream. */
private Bitstream bitstream;
Bitstream bitstream;
Decoder decoder;
Header header;
SampleBuffer buf;
int channels;
int sampleRate;
int bufLen = 0;
boolean atEnd=false;
int bpos; //byte pos
public Mp3InputStream(InputStream resourceAsStream) {
/** The MPEG decoder. */
private Decoder decoder;
/** The frame header extractor. */
private Header header;
/** The buffer. */
private SampleBuffer buf;
/** The number of channels. */
private int channels;
/** The sample rate. */
private int sampleRate;
/** The buffer length. */
private int bufLen = 0;
/** True if we've reached the end of the available data. */
private boolean endOfStream = false;
/** The byte position. */
private int bpos;
/**
* Create a new stream to decode MP3 data.
* @param input the input stream from which to read the MP3 file
*/
public Mp3InputStream(InputStream input) {
decoder = new Decoder();
bitstream = new Bitstream(resourceAsStream);
bitstream = new Bitstream(input);
try {
header = bitstream.readFrame();
} catch (BitstreamException e) {
e.printStackTrace();
Log.error(e);
}
channels = header.mode()==Header.SINGLE_CHANNEL?1:2;
channels = (header.mode() == Header.SINGLE_CHANNEL) ? 1 : 2;
sampleRate = header.frequency();
buf = new SampleBuffer(sampleRate, channels);
decoder.setOutputBuffer(buf);
//*
try {
decoder.decodeFrame(header, bitstream);
} catch (DecoderException e) {
e.printStackTrace();
Log.error(e);
}
//*/
bufLen = buf.getBufferLength();
bitstream.closeFrame();
}
@Override
public int read() throws IOException {
if(atEnd())
if (atEnd())
return -1;
while(bpos/2>=bufLen){
while (bpos / 2 >= bufLen) {
try {
header = bitstream.readFrame();
if(header == null){
if (header == null) {
buf.clear_buffer();
atEnd = true;
endOfStream = true;
return -1;
}
buf.clear_buffer();
decoder.decodeFrame(header, bitstream);
bufLen = buf.getBufferLength();
bitstream.closeFrame();
} catch (DecoderException e) {
e.printStackTrace();
} catch (BitstreamException e) {
e.printStackTrace();
} catch (DecoderException | BitstreamException e) {
Log.error(e);
}
bpos=0;
bpos = 0;
}
int npos = bpos/2;
int npos = bpos / 2;
bpos++;
if(bpos%2==0)
return (buf.getBuffer()[npos]>>8)&0xff;
if (bpos % 2 == 0)
return (buf.getBuffer()[npos] >> 8) & 0xff;
else
return (buf.getBuffer()[npos])&0xff;
return (buf.getBuffer()[npos]) & 0xff;
}
@Override
public boolean atEnd() {
return atEnd;
}
public boolean atEnd() { return endOfStream; }
@Override
public int getChannels() {
return channels;
}
public int getChannels() { return channels; }
@Override
public int getRate() { return sampleRate; }
@Override
public int getRate() {
return sampleRate;
}
/**
* @see java.io.InputStream#read(byte[], int, int)
*/
public int read(byte[] b, int off, int len) throws IOException {
for (int i=0;i<len;i++) {
for (int i = 0; i < len; i++) {
try {
int value = read();
if (value >= 0) {
if (value >= 0)
b[i] = (byte) value;
} else {
if (i == 0) {
return -1;
} else {
return i;
}
}
else
return (i == 0) ? -1 : i;
} catch (IOException e) {
//Log.error(e);
e.printStackTrace();
Log.error(e);
return i;
}
}
return len;
}
/**
* @see java.io.InputStream#read(byte[])
*/
public int read(byte[] b) throws IOException {
return read(b, 0, b.length);
}
@Override
public int read(byte[] b) throws IOException { return read(b, 0, b.length); }
@Override
public long skip(long length) {
//System.out.println("skip"+length);
int skiped = 0;
if(bufLen<=0){
System.out.println("We don't know buf Length yet");
//throw new Error("We don't know buf Length yet");
}
while(skiped+bufLen*2<length){
if (bufLen <= 0)
Log.warn("Mp3InputStream: skip: bufLen not yet determined.");
int skipped = 0;
while (skipped + bufLen * 2 < length) {
try {
header = bitstream.readFrame();
if(header == null){
//System.out.println("Header is null");
atEnd = true;
if (header == null) {
// Log.warn("Mp3InputStream: skip: header is null.");
endOfStream = true;
return -1;
}
//last frame that won't be skiped so better read it
if(skiped+bufLen*2*4 >=length || bufLen<=0){
// last frame that won't be skipped so better read it
if (skipped + bufLen * 2 * 4 >= length || bufLen <= 0) {
buf.clear_buffer();
decoder.decodeFrame(header, bitstream);
bufLen = buf.getBufferLength();
}
skiped+=bufLen*2-bpos;
skipped += bufLen * 2 - bpos;
bitstream.closeFrame();
bpos=0;
} catch (BitstreamException e) {
e.printStackTrace();
}catch (DecoderException e) {
e.printStackTrace();
bpos = 0;
} catch (BitstreamException | DecoderException e) {
Log.error(e);
}
}
if(bufLen*2-bpos>length-skiped){
bpos+=length-skiped;
skiped+=length-skiped;
if (bufLen * 2 - bpos > length - skipped) {
bpos += length - skipped;
skipped += length - skipped;
}
return skiped;
return skipped;
}
}

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

@ -1,15 +1,29 @@
/*
Copyright (c) 2013, Slick2D
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of the Slick2D nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <EFBFBD>gAS IS<EFBFBD>h AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Copyright (c) 2013, Slick2D
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* - Neither the name of the Slick2D nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.newdawn.slick.openal;
@ -35,9 +49,9 @@ import org.newdawn.slick.util.ResourceLoader;
*/
public class OpenALStreamPlayer {
/** The number of buffers to maintain */
public static final int BUFFER_COUNT = 20;
public static final int BUFFER_COUNT = 20; // 3
/** The size of the sections to stream from the stream */
private static final int sectionSize = 4096;
private static final int sectionSize = 4096; // 4096 * 20
/** The buffer read from the data stream */
private byte[] buffer = new byte[sectionSize];
@ -64,16 +78,29 @@ public class OpenALStreamPlayer {
/** The pitch of the music */
private float pitch;
/** Position in seconds of the previously played buffers */
//private float positionOffset;
// private float positionOffset;
/** The stream position. */
long streamPos = 0;
/** The sample rate. */
int sampleRate;
/** The sample size. */
int sampleSize;
/** The play position. */
long playedPos;
/** The music length. */
long musicLength = -1;
/** The time of the last update, in ms. */
long lastUpdateTime = System.currentTimeMillis();
/** The offset time. */
long offsetTime = 0;
/**
* Create a new player to work on an audio stream
*
@ -111,13 +138,13 @@ public class OpenALStreamPlayer {
if (audio != null) {
audio.close();
}
AudioInputStream audio;
if (url != null) {
audio = new OggInputStream(url.openStream());
} else {
if(ref.toLowerCase().endsWith(".mp3"))
if (ref.toLowerCase().endsWith(".mp3"))
audio = new Mp3InputStream(ResourceLoader.getResourceAsStream(ref));
else
audio = new OggInputStream(ResourceLoader.getResourceAsStream(ref));
@ -125,12 +152,11 @@ public class OpenALStreamPlayer {
this.audio = audio;
sampleRate = audio.getRate();
if (audio.getChannels() > 1) {
if (audio.getChannels() > 1)
sampleSize = 4; // AL10.AL_FORMAT_STEREO16
} else {
else
sampleSize = 2; // AL10.AL_FORMAT_MONO16
}
//positionOffset = 0;
// positionOffset = 0;
streamPos = 0;
}
@ -150,14 +176,11 @@ public class OpenALStreamPlayer {
private synchronized void removeBuffers() {
AL10.alSourceStop(source);
IntBuffer buffer = BufferUtils.createIntBuffer(1);
while (AL10.alGetSourcei(source, AL10.AL_BUFFERS_QUEUED) > 0)
{
while (AL10.alGetSourcei(source, AL10.AL_BUFFERS_QUEUED) > 0) {
AL10.alSourceUnqueueBuffers(source, buffer);
buffer.clear();
}
}
/**
@ -213,16 +236,16 @@ public class OpenALStreamPlayer {
AL10.alSourceUnqueueBuffers(source, unqueued);
int bufferIndex = unqueued.get(0);
int bufferLength = AL10.alGetBufferi(bufferIndex, AL10.AL_SIZE);
playedPos += bufferLength;
lastUpdateTime = System.currentTimeMillis();
if(musicLength>0 && playedPos>musicLength)
if (musicLength > 0 && playedPos > musicLength)
playedPos -= musicLength;
if (stream(bufferIndex)) {
if (stream(bufferIndex)) {
AL10.alSourceQueueBuffers(source, unqueued);
} else {
remainingBufferCount--;
@ -289,21 +312,18 @@ public class OpenALStreamPlayer {
*/
public synchronized boolean setPosition(float position) {
try {
long samplePos = (long) (position*sampleRate)*sampleSize;
if(streamPos > samplePos){
long samplePos = (long) (position * sampleRate) * sampleSize;
if (streamPos > samplePos)
initStreams();
}
long skiped = audio.skip(samplePos - streamPos);
if(skiped>=0)
streamPos+=skiped;
else{
System.out.println("Failed to skip?");
}
while(streamPos+buffer.length < samplePos){
long skipped = audio.skip(samplePos - streamPos);
if (skipped >= 0)
streamPos += skipped;
else
Log.warn("OpenALStreamPlayer: setPosition: failed to skip.");
while (streamPos + buffer.length < samplePos) {
int count = audio.read(buffer);
if (count != -1) {
streamPos += count;
@ -316,9 +336,9 @@ public class OpenALStreamPlayer {
return false;
}
}
playedPos = streamPos;
startPlayback();
return true;
@ -345,7 +365,6 @@ public class OpenALStreamPlayer {
AL10.alSourceQueueBuffers(source, bufferNames);
AL10.alSourcePlay(source);
lastUpdateTime = System.currentTimeMillis();
}
/**
@ -354,20 +373,24 @@ public class OpenALStreamPlayer {
* @return The current position in seconds.
*/
public float getPosition() {
float playedTime = ((float)playedPos/(float)sampleSize)/(float)sampleRate;
float timePosition = playedTime
+ (System.currentTimeMillis()-lastUpdateTime)/1000f;
//+ AL10.alGetSourcef(source, AL11.AL_SEC_OFFSET);
float playedTime = ((float) playedPos / (float) sampleSize) / sampleRate;
float timePosition = playedTime + (System.currentTimeMillis() - lastUpdateTime) / 1000f;
// + AL10.alGetSourcef(source, AL11.AL_SEC_OFFSET);
return timePosition;
}
long offsetTime = 0;
/**
* Processes a track pause.
*/
public void pausing() {
offsetTime = System.currentTimeMillis()-lastUpdateTime;
offsetTime = System.currentTimeMillis() - lastUpdateTime;
}
/**
* Processes a track resume.
*/
public void resuming() {
lastUpdateTime = System.currentTimeMillis()-offsetTime;
lastUpdateTime = System.currentTimeMillis() - offsetTime;
}
}

42
src/org/newdawn/slick/openal/SoundStore.java
View File

@ -1,16 +1,31 @@
/*
Copyright (c) 2013, Slick2D
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of the Slick2D nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <EFBFBD>gAS IS<EFBFBD>h AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Copyright (c) 2013, Slick2D
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* - Neither the name of the Slick2D nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.newdawn.slick.openal;
import java.io.BufferedInputStream;
@ -529,7 +544,7 @@ public class SoundStore {
public void pauseLoop() {
if ((soundWorks) && (currentMusic != -1)){
paused = true;
if(stream!=null)
if (stream != null)
stream.pausing();
AL10.alSourcePause(currentMusic);
}
@ -542,9 +557,8 @@ public class SoundStore {
if ((music) && (soundWorks) && (currentMusic != -1)){
paused = false;
AL10.alSourcePlay(currentMusic);
if(stream!=null)
if (stream != null)
stream.resuming();
}
}