ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

async functioning now

Browse Source
This commit is contained in:
Harrison Deng 2017-10-06 21:05:05 -05:00
parent 29e8d550dd
commit 2801adbd6e
4 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/zero1hd/rhythmbullet/audio/Mp3AudioData.java → core/src/zero1hd/rhythmbullet/audio/Mp3Manager.java
View File

@ -23,7 +23,7 @@ import javazoom.jl.decoder.Header;
import javazoom.jl.decoder.MP3Decoder; import javazoom.jl.decoder.MP3Decoder;
import javazoom.jl.decoder.OutputBuffer; import javazoom.jl.decoder.OutputBuffer;
public class Mp3AudioData implements MusicManager { public class Mp3Manager implements MusicManager {
private int readWindowSize = 1024; private int readWindowSize = 1024;
private int currentReadWindowIndex; private int currentReadWindowIndex;
@ -41,7 +41,6 @@ public class Mp3AudioData implements MusicManager {
private byte[] workset; private byte[] workset;
private int indexHead = -1; private int indexHead = -1;
<<<<<<< HEAD:core/src/zero1hd/rhythmbullet/audio/Mp3Manager.java
private ExecutorService exec; private ExecutorService exec;
private boolean loadComplete; private boolean loadComplete;
@ -59,17 +58,6 @@ public class Mp3AudioData implements MusicManager {
loadComplete = true; loadComplete = true;
}); });
=======
public Mp3AudioData(FileHandle audioFile) {
try {
MP3File mp3File = new MP3File(audioFile.file());
sampleCount = MathUtils.round((float) (mp3File.getAudioHeader().getSampleRateAsNumber()*mp3File.getMP3AudioHeader().getPreciseTrackLength()));
durationInSeconds = mp3File.getMP3AudioHeader().getNumberOfFrames()/readWindowSize;
sampleRate = mp3File.getMP3AudioHeader().getSampleRateAsNumber();
} catch (IOException | TagException | ReadOnlyFileException | InvalidAudioFrameException e) {
e.printStackTrace();
}
>>>>>>> parent of 23df4f8... smooth rise of bars:core/src/zero1hd/rhythmbullet/audio/Mp3AudioData.java
bitstream = new Bitstream(audioFile.read()); bitstream = new Bitstream(audioFile.read());
decoder = new MP3Decoder(); decoder = new MP3Decoder();

4
core/src/zero1hd/rhythmbullet/audio/SongList.java
View File

@ -28,9 +28,9 @@ public class SongList {
public MusicManager getAudioData(FileHandle file) { public MusicManager getAudioData(FileHandle file) {
if (file.extension().equalsIgnoreCase("wav")) { if (file.extension().equalsIgnoreCase("wav")) {
return new WavAudioData(file); return new WAVManager(file);
} else if (file.extension().equalsIgnoreCase("mp3")) { } else if (file.extension().equalsIgnoreCase("mp3")) {
return new Mp3AudioData(file); return new Mp3Manager(file);
} }
return null; return null;
} }

8
core/src/zero1hd/rhythmbullet/audio/WavAudioData.java → core/src/zero1hd/rhythmbullet/audio/WAVManager.java
View File

@ -12,19 +12,15 @@ import com.badlogic.gdx.files.FileHandle;
import zero1hd.rhythmbullet.audio.wavedecoder.WavDecoder; import zero1hd.rhythmbullet.audio.wavedecoder.WavDecoder;
public class WavAudioData implements MusicManager { public class WAVManager implements MusicManager {
private int readWindowSize = 1024; private int readWindowSize = 1024;
private AudioFormat format; private AudioFormat format;
private int readIndex; private int readIndex;
private int currentReadWindowIndex; private int currentReadWindowIndex;
private Music playbackMusic; private Music playbackMusic;
WavDecoder decoder; WavDecoder decoder;
<<<<<<< HEAD:core/src/zero1hd/rhythmbullet/audio/WAVManager.java
public WAVManager(FileHandle file) {
=======
public WavAudioData(FileHandle file) { public WAVManager(FileHandle file) {
>>>>>>> parent of 23df4f8... smooth rise of bars:core/src/zero1hd/rhythmbullet/audio/WavAudioData.java
try { try {
decoder = new WavDecoder(file); decoder = new WavDecoder(file);
} catch (InvalidParameterException | IOException e) { } catch (InvalidParameterException | IOException e) {

9
core/src/zero1hd/rhythmbullet/graphics/ui/components/Visualizer.java
View File

@ -24,6 +24,10 @@ public class Visualizer extends Widget {
@Override @Override
public void act(float delta) { public void act(float delta) {
if (mm != null && mm.isFinishedLoading() && !mmSet) {
vis.setMM(mm);
mmSet = true;
}
vis.modify(delta); vis.modify(delta);
vis.setHeight(getHeight()); vis.setHeight(getHeight());
vis.setWidth(getWidth()); vis.setWidth(getWidth());
@ -34,11 +38,6 @@ public class Visualizer extends Widget {
vis.updatePositionInfo(); vis.updatePositionInfo();
} }
vis.calculate(); vis.calculate();
if (mm != null && mm.isFinishedLoading() && !mmSet) {
vis.setMM(mm);
mmSet = true;
}
super.act(delta); super.act(delta);
} }