Skip to content

Cache audio loads so that they only happen once #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdrpenguin04 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Cache audio loads so that they only happen once #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
780bdc0
Cache audio loads so that they only happen once
rdrpenguin04 Oct 6, 2019
c7a4ee5
Import HashMap
rdrpenguin04 Oct 6, 2019
f557e0c
This is what I get for using nano to write code
rdrpenguin04 Oct 6, 2019
f7778bd
Clip sucks
rdrpenguin04 Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions src/engine/audio/AudioPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.io.File;
import java.io.IOException;
import java.util.LinkedList;
import java.util.HashMap;
import java.util.Queue;

import javax.sound.sampled.AudioInputStream;
Expand Down Expand Up @@ -35,25 +36,32 @@ private void closeStream(AudioInputStream stream) {
}
}

private HashMap<File, Clip> clipCache = new HashMap<>();

private void playFile(File f) {
AudioInputStream ss = null;

try {
final AudioInputStream stream = AudioSystem.getAudioInputStream(f);
ss = stream;
Clip audio;
if(!clipCache.containsKey(f)) {
final AudioInputStream stream = AudioSystem.getAudioInputStream(f);
ss = stream;

final Clip audio = AudioSystem.getClip();
audio.open(stream);
audio.addLineListener(new LineListener() {
@Override
public void update(LineEvent event) {
Type eventType = event.getType();
if (eventType == Type.STOP || eventType == Type.CLOSE) {
audio.close();
closeStream(stream);
audio = AudioSystem.getClip();
audio.open(stream);
audio.addLineListener(new LineListener() {
@Override
public void update(LineEvent event) {
Type eventType = event.getType();
if (eventType == Type.STOP || eventType == Type.CLOSE) {
audio.close();
closeStream(stream);
}
}
}
});
});
clipCache.put(f, audio);
} else audio = clipCache.get(f);
audio.setFramePosition(0);
audio.start();

} catch(IOException ioex) {
Expand Down