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

Fix api for upstream merge

Browse Source
This commit is contained in:
Lucas
2019-06-26 22:05:00 +02:00
parent c6855aa648
commit f8ad72c4cd
31 changed files with 135 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
runescape-client/src/main/java/RawPcmStream.java
View File

@@ -28,8 +28,8 @@ public class RawPcmStream extends PcmStream {
@Export("__l")
int __l;
@ObfuscatedName("e")
@Export("__e")
int __e;
@Export("numLoops")
int numLoops;
@ObfuscatedName("x")
@Export("start")
int start;
@@ -40,7 +40,6 @@ public class RawPcmStream extends PcmStream {
@Export("__k")
boolean __k;
@ObfuscatedName("n")
@Export("surfaceOffsetY")
int __n;
@ObfuscatedName("i")
@Export("__i")
@@ -122,7 +121,7 @@ public class RawPcmStream extends PcmStream {
int var7 = var4.samples.length << 8;
int var8 = var6 - var5;
if(var8 <= 0) {
this.__e = 0;
this.numLoops = 0;
}
int var9 = var2;
@@ -147,7 +146,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var7 - 1;
}
if(this.__e < 0) {
if(this.numLoops < 0) {
if(this.__k) {
if(this.__f < 0) {
var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
@@ -195,7 +194,7 @@ public class RawPcmStream extends PcmStream {
}
}
} else {
if(this.__e > 0) {
if(this.numLoops > 0) {
if(this.__k) {
label140: {
if(this.__f < 0) {
@@ -206,7 +205,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var5 + var5 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break label140;
}
}
@@ -219,7 +218,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var6 + var6 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break;
}
@@ -230,7 +229,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var5 + var5 - 1 - this.__m;
this.__f = -this.__f;
} while(--this.__e != 0);
} while(--this.numLoops != 0);
}
} else {
int var10;
@@ -242,14 +241,14 @@ public class RawPcmStream extends PcmStream {
}
var10 = (var6 - 1 - this.__m) / var8;
if(var10 >= this.__e) {
this.__m += var8 * this.__e;
this.__e = 0;
if(var10 >= this.numLoops) {
this.__m += var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.__m += var8 * var10;
this.__e -= var10;
this.numLoops -= var10;
}
} else {
while(true) {
@@ -259,14 +258,14 @@ public class RawPcmStream extends PcmStream {
}
var10 = (this.__m - var5) / var8;
if(var10 >= this.__e) {
this.__m -= var8 * this.__e;
this.__e = 0;
if(var10 >= this.numLoops) {
this.__m -= var8 * this.numLoops;
this.numLoops = 0;
break;
}
this.__m -= var8 * var10;
this.__e -= var10;
this.numLoops -= var10;
}
}
}
@@ -293,9 +292,9 @@ public class RawPcmStream extends PcmStream {
}
@ObfuscatedName("x")
@Export("__x_181")
public synchronized void __x_181(int var1) {
this.__e = var1;
@Export("setNumLoops")
public synchronized void setNumLoops(int var1) {
this.numLoops = var1;
}
@ObfuscatedName("d")
@@ -327,7 +326,7 @@ public class RawPcmStream extends PcmStream {
int var5 = var2.samples.length << 8;
int var6 = var4 - var3;
if(var6 <= 0) {
this.__e = 0;
this.numLoops = 0;
}
if(this.__m < 0) {
@@ -351,7 +350,7 @@ public class RawPcmStream extends PcmStream {
}
this.__m += this.__f * var1;
if(this.__e < 0) {
if(this.numLoops < 0) {
if(!this.__k) {
if(this.__f < 0) {
if(this.__m >= var3) {
@@ -390,7 +389,7 @@ public class RawPcmStream extends PcmStream {
}
} else {
if(this.__e > 0) {
if(this.numLoops > 0) {
if(this.__k) {
label123: {
if(this.__f < 0) {
@@ -400,7 +399,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var3 + var3 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break label123;
}
}
@@ -412,7 +411,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var4 + var4 - 1 - this.__m;
this.__f = -this.__f;
if(--this.__e == 0) {
if(--this.numLoops == 0) {
break;
}
@@ -422,7 +421,7 @@ public class RawPcmStream extends PcmStream {
this.__m = var3 + var3 - 1 - this.__m;
this.__f = -this.__f;
} while(--this.__e != 0);
} while(--this.numLoops != 0);
}
} else {
int var7;
@@ -432,28 +431,28 @@ public class RawPcmStream extends PcmStream {
}
var7 = (var4 - 1 - this.__m) / var6;
if(var7 < this.__e) {
if(var7 < this.numLoops) {
this.__m += var6 * var7;
this.__e -= var7;
this.numLoops -= var7;
return;
}
this.__m += var6 * this.__e;
this.__e = 0;
this.__m += var6 * this.numLoops;
this.numLoops = 0;
} else {
if(this.__m < var4) {
return;
}
var7 = (this.__m - var3) / var6;
if(var7 < this.__e) {
if(var7 < this.numLoops) {
this.__m -= var6 * var7;
this.__e -= var7;
this.numLoops -= var7;
return;
}
this.__m -= var6 * this.__e;
this.__e = 0;
this.__m -= var6 * this.numLoops;
this.numLoops = 0;
}
}
}
@@ -779,9 +778,9 @@ public class RawPcmStream extends PcmStream {
int __az_179() {
int var1 = this.__u * 3 >> 6;
var1 = (var1 ^ var1 >> 31) + (var1 >>> 31);
if(this.__e == 0) {
if(this.numLoops == 0) {
var1 -= var1 * this.__m / (((RawSound)super.sound).samples.length << 8);
} else if(this.__e >= 0) {
} else if(this.numLoops >= 0) {
var1 -= var1 * this.start / ((RawSound)super.sound).samples.length;
}
@@ -872,7 +871,8 @@ public class RawPcmStream extends PcmStream {
@ObfuscatedSignature(
signature = "(Lcx;II)Lds;"
)
public static RawPcmStream method2497(RawSound var0, int var1, int var2) {
@Export("createRawPcmStream")
public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) {
return var0.samples != null && var0.samples.length != 0?new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class309.PcmPlayer_sampleRate * 100)), var2 << 6):null;
}