Skip to content

Add catch clause for UnsupportedAudioFileException and fix LineUnavailableExceptions #371

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

Merged
itdelatrisu merged 2 commits into from
Mar 10, 2018
Merged

Add catch clause for UnsupportedAudioFileException and fix LineUnavailableExceptions #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2477e7f
Don't reopen a line with the same format
Lyonlancer5 Mar 10, 2018
15ab93d
Add catch clause for UnsupportedAudioFileException
Lyonlancer5 Mar 10, 2018
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
2 changes: 1 addition & 1 deletion src/itdelatrisu/opsu/audio/MultiClip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private Clip getClip() throws LineUnavailableException {
// NOTE: AudioSystem.getClip() doesn't work on some Linux setups.
DataLine.Info info = new DataLine.Info(Clip.class, format);
c = (Clip) AudioSystem.getLine(info);
if (format != null)
if (format != null && !c.isOpen())
c.open(format, audioData, 0, audioData.length);

// fix PulseAudio issues (hacky, but can't do an instanceof check)
Expand Down
4 changes: 4 additions & 0 deletions src/itdelatrisu/opsu/audio/SoundController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import javax.sound.sampled.DataLine;
import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.UnsupportedAudioFileException;

import org.newdawn.slick.Color;
import org.newdawn.slick.SlickException;
Expand Down Expand Up @@ -97,6 +98,9 @@ private static MultiClip loadClip(String ref) {

AudioInputStream audioIn = AudioSystem.getAudioInputStream(url);
return loadClip(ref, audioIn);
} catch (UnsupportedAudioFileException e) {
ErrorHandler.error(String.format("Invalid data found on audio file '%s'.", ref), e, true);
return null;
} catch (Exception e) {
ErrorHandler.error(String.format("Failed to load audio file '%s'.", ref), e, true);
return null;
Expand Down