ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

soundmanager: rework

Browse Source
This commit is contained in:
ThatGamerBlue
2021-02-09 22:36:10 +00:00
parent b8d806da76
commit 1b70cb55fc
2 changed files with 90 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
runelite-client/src/main/java/com/openosrs/client/game/Sound.java
View File

@@ -1,42 +1,67 @@
/*
* Copyright (c) 2021, ThatGamerBlue <thatgamerblue@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. 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.
*
* 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 com.openosrs.client.game; package com.openosrs.client.game;
public enum Sound import java.io.File;
import java.net.URL;
import lombok.EqualsAndHashCode;
import lombok.SneakyThrows;
import lombok.Value;
import net.runelite.client.RuneLite;
public abstract class Sound
{ {
FIFTEEN_SECONDS(1, "net/runelite/client/game/sounds/15seconds.wav"), public abstract URL getPath();
FIVE_SECONDS(2, "net/runelite/client/game/sounds/5seconds.wav"),
ATTACK_WITH_MAGIC(3, "net/runelite/client/game/sounds/attackmagic.wav"),
ATTACK_WITH_MELEE(4, "net/runelite/client/game/sounds/attackmelee.wav"),
ATTACK_WITH_RANGED(5, "net/runelite/client/game/sounds/attackranged.wav"),
INCOMING(6, "net/runelite/client/game/sounds/incoming.wav"),
MOVE(7, "net/runelite/client/game/sounds/move.wav"),
PRAY_MAGIC(8, "net/runelite/client/game/sounds/praymagic.wav"),
PRAY_MELEE(9, "net/runelite/client/game/sounds/praymelee.wav"),
PRAY_RANGED(10, "net/runelite/client/game/sounds/prayranged.wav"),
REENABLE_PRAYER(11, "net/runelite/client/game/sounds/reenableprayer.wav"),
RUNAWAY(12, "net/runelite/client/game/sounds/runaway.wav"),
LOW_HEATLH(13, "net/runelite/client/game/sounds/lowhealth.wav"),
LOW_PRAYER(14, "net/runelite/client/game/sounds/lowprayer.wav"),
OUT_OF_COMBAT(15, "net/runelite/client/game/sounds/outofcombat.wav"),
RESTORED_SPECIAL_ATTACK(16, "net/runelite/client/game/sounds/restorespec.wav"),
IDLE(17, "net/runelite/client/game/sounds/idle.wav"),
BREAK(18, "net/runelite/client/game/sounds/break.wav");
private final String filePath; // TODO: these inner classes should probably be removed
private final int id;
Sound(int id, String filePath) @Value
@EqualsAndHashCode(callSuper = true) // stop the warning
static class SoundJarResource extends Sound
{ {
this.id = id; String path;
this.filePath = filePath;
@Override
public URL getPath()
{
return RuneLite.class.getResource(path);
}
} }
public String getFilePath() @Value
@EqualsAndHashCode(callSuper = true) // stop the warning
static class SoundFileResource extends Sound
{ {
return this.filePath; File file;
}
public int getId() @Override
{ @SneakyThrows
return this.id; public URL getPath()
{
return file.toURI().toURL();
}
} }
} }

48
runelite-client/src/main/java/com/openosrs/client/game/SoundManager.java
View File

@@ -1,3 +1,28 @@
/*
* Copyright (c) 2021, ThatGamerBlue <thatgamerblue@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. 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.
*
* 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 com.openosrs.client.game; package com.openosrs.client.game;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -21,17 +46,14 @@ public class SoundManager
{ {
public void play(final Sound sound) public void play(final Sound sound)
{ {
new Thread(new Runnable() new Thread(() ->
{ {
@Override try (AudioInputStream in = AudioSystem.getAudioInputStream(sound.getPath()))
public void run()
{ {
try AudioFormat outFormat = SoundManager.this.getOutFormat(in.getFormat());
DataLine.Info info = new DataLine.Info(SourceDataLine.class, outFormat);
try (SourceDataLine line = (SourceDataLine) AudioSystem.getLine(info))
{ {
AudioInputStream in = AudioSystem.getAudioInputStream(this.getClass().getClassLoader().getResource(sound.getFilePath()));
AudioFormat outFormat = SoundManager.this.getOutFormat(in.getFormat());
DataLine.Info info = new DataLine.Info(SourceDataLine.class, outFormat);
SourceDataLine line = (SourceDataLine) AudioSystem.getLine(info);
if (line != null) if (line != null)
{ {
line.open(outFormat, 2200); line.open(outFormat, 2200);
@@ -44,15 +66,15 @@ public class SoundManager
gainControl.setValue((float) (Math.log((double) volume / 100.0) / Math.log(10.0) * 20.0)); gainControl.setValue((float) (Math.log((double) volume / 100.0) / Math.log(10.0) * 20.0));
} }
line.start(); line.start();
SoundManager.this.stream(AudioSystem.getAudioInputStream(outFormat, in), line); stream(AudioSystem.getAudioInputStream(outFormat, in), line);
line.drain(); line.drain();
line.stop(); line.stop();
} }
} }
catch (IOException | LineUnavailableException | UnsupportedAudioFileException e) }
{ catch (IOException | LineUnavailableException | UnsupportedAudioFileException e)
throw new IllegalStateException(e); {
} throw new IllegalStateException(e);
} }
}).start(); }).start();
} }