external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

add dispose clips

Browse Source
This commit is contained in:
Anthony Calosa
2023-03-15 22:30:39 +08:00
parent e59bfb8a1f
commit 3a849e77ab
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-desktop/src/main/java/forge/sound/AudioClip.java
View File

@@ -87,6 +87,14 @@ public class AudioClip implements IAudioClip {
getIdleClip().loop();
}
@Override
public void dispose() {
for (byte[] b : audioClips.values()) {
b = null;
}
audioClips.clear();
}
@Override
public final void stop() {
for (ClipWrapper clip: clips) {

8
forge-gui-mobile/src/forge/sound/AudioClip.java
View File

@@ -68,6 +68,14 @@ public class AudioClip implements IAudioClip {
clip.loop();
}
@Override
public void dispose() {
if (clip != null) {
clip.dispose();
clip = null;
}
}
public final void stop() {
if (clip == null) {
return;

1
forge-gui/src/main/java/forge/sound/IAudioClip.java
View File

@@ -5,4 +5,5 @@ public interface IAudioClip {
boolean isDone();
void stop();
void loop();
void dispose();
}

3
forge-gui/src/main/java/forge/sound/NoSoundClip.java
View File

@@ -15,4 +15,7 @@ public class NoSoundClip implements IAudioClip {
@Override
public void loop() { }
@Override
public void dispose() { }
}

19
forge-gui/src/main/java/forge/sound/SoundSystem.java
View File

@@ -57,9 +57,9 @@ public class SoundSystem {
final String resource = type.getResourceFileName();
clip = GuiBase.getInterface().createAudioClip(resource);
if (clip == null) {
clip = emptySound;
}
loadedClips.put(type, clip);
return emptySound;
} else
loadedClips.put(type, clip);
}
return clip;
}
@@ -85,9 +85,9 @@ public class SoundSystem {
if (null == clip) { // cache miss
clip = GuiBase.getInterface().createAudioClip(fileName);
if (clip == null) {
clip = emptySound;
}
loadedScriptClips.put(fileName, clip);
return emptySound;
} else
loadedScriptClips.put(fileName, clip);
}
return clip;
}
@@ -243,6 +243,7 @@ public class SoundSystem {
currentTrack.dispose();
currentTrack = null;
}
invalidateSoundCache();
}
public void fadeModifier(float value) {
@@ -288,7 +289,13 @@ public class SoundSystem {
}
public void invalidateSoundCache() {
for (IAudioClip c : loadedClips.values()) {
c.dispose();
}
loadedClips.clear();
for (IAudioClip c : loadedScriptClips.values()) {
c.dispose();
}
loadedScriptClips.clear();
}