rs-client: refactoring (#1344)

* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions

View File

@@ -38,8 +38,8 @@ public class DevicePcmPlayer extends PcmPlayer {
)
@Export("init")
protected void init() {
this.format = new AudioFormat((float)CollisionMap.PcmPlayer_sampleRate, 16, class169.isStereo ? 2 : 1, true, false);
this.byteSamples = new byte[256 << (class169.isStereo ? 2 : 1)];
this.format = new AudioFormat((float)CollisionMap.PcmPlayer_sampleRate, 16, FileSystem.PcmPlayer_stereo ? 2 : 1, true, false);
this.byteSamples = new byte[256 << (FileSystem.PcmPlayer_stereo ? 2 : 1)];
}
@ObfuscatedName("w")
@@ -50,7 +50,7 @@ public class DevicePcmPlayer extends PcmPlayer {
@Export("open")
protected void open(int var1) throws LineUnavailableException {
try {
Info var2 = new Info(SourceDataLine.class, this.format, var1 << (class169.isStereo ? 2 : 1));
Info var2 = new Info(SourceDataLine.class, this.format, var1 << (FileSystem.PcmPlayer_stereo ? 2 : 1));
this.line = (SourceDataLine)AudioSystem.getLine(var2);
this.line.open();
this.line.start();
@@ -85,14 +85,14 @@ public class DevicePcmPlayer extends PcmPlayer {
)
@Export("position")
protected int position() {
return this.capacity2 - (this.line.available() >> (class169.isStereo ? 2 : 1));
return this.capacity2 - (this.line.available() >> (FileSystem.PcmPlayer_stereo ? 2 : 1));
}
@ObfuscatedName("p")
@Export("write")
protected void write() {
int var1 = 256;
if (class169.isStereo) {
if (FileSystem.PcmPlayer_stereo) {
var1 <<= 1;
}