Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2019-11-28 19:34:22 +01:00
63 changed files with 1570 additions and 777 deletions

View File

@@ -38,7 +38,7 @@ public class DevicePcmPlayer extends PcmPlayer {
)
@Export("init")
protected void init() {
this.format = new AudioFormat((float)Messages.field1274, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
this.format = new AudioFormat((float)Messages.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
}