sen/tcr
sen/tcr
1
0
Fork 0
Code Activity

opl cleanup

Browse source
This commit is contained in:
Sen 2025-08-25 15:33:58 +02:00
parent 43956af38d
commit bbbace7f46
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
7 changed files with 8145 additions and 8135 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/src/main/java/client/Client.java
View file

@ -35,8 +35,8 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import client.audio.AudioInterface;
import client.audio.AudioInterface.MidiBank;
import client.audio.AudioInterface.MidiHandle;
import client.audio.MidiBank;
import client.audio.MidiDecoder;
import client.audio.SoundManager;
import client.audio.Volume;
import client.gui.FileCallback;
@ -2594,7 +2594,7 @@ public class Client implements IThreadListener {
public void setMidiDebug() {
if(this.audio != null) {
MidiHandle midi = this.audio.alGetMidi();
MidiDecoder midi = this.audio.alGetMidi();
if(midi != null)
midi.setDebug(this.midiDebug);
}
@ -3460,9 +3460,9 @@ public class Client implements IThreadListener {
Log.SOUND.error(e, "Konnte Datei '%s' nicht laden", file);
return;
}
MidiHandle midi;
MidiDecoder midi;
try {
midi = new MidiHandle(data, this.midiNoWait, this.midiVoices, this.midiBank, this.midiKeep, this.midiUnknown, this.midiVelocity);
midi = new MidiDecoder(data, this.midiNoWait, this.midiVoices, this.midiBank, this.midiKeep, this.midiUnknown, this.midiVelocity);
}
catch(Throwable e) {
Log.SOUND.error(e, "Konnte MIDI '%s' nicht laden", file);
@ -3473,7 +3473,7 @@ public class Client implements IThreadListener {
}
public void testMidi(int start) {
MidiHandle midi = new MidiHandle(this.midiVoices, this.midiBank, this.midiKeep, this.midiUnknown, this.midiVelocity, start);
MidiDecoder midi = new MidiDecoder(this.midiVoices, this.midiBank, this.midiKeep, this.midiUnknown, this.midiVelocity, start);
midi.setDebug(this.midiDebug);
this.audio.alMidi(midi);
}