From d5e1392ae760bb1024a816c46fb99dceddaa1298 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Fri, 5 Feb 2021 02:26:33 +0800 Subject: [PATCH] [Mobile] set volume when track changes --- .../src/main/java/forge/sound/AudioClip.java | 1 - forge-gui-mobile/src/forge/Forge.java | 5 ---- .../src/forge/animation/AbilityEffect.java | 5 ++-- .../forge/screens/settings/SettingsPage.java | 23 ++----------------- .../main/java/forge/sound/SoundSystem.java | 7 +----- 5 files changed, 6 insertions(+), 35 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java b/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java index 311b7ad5b16..11f6bcb6cdb 100644 --- a/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java +++ b/forge-gui-desktop/src/main/java/forge/sound/AudioClip.java @@ -27,7 +27,6 @@ import forge.properties.ForgeConstants; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.MissingResourceException; diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index a623ea7aec4..4a7e9321ff7 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -78,8 +78,6 @@ public class Forge implements ApplicationListener { public static int androidVersion = 0; public static boolean autoCache = false; public static int lastButtonIndex = 0; - public static float clipVol = 1f; - public static float musicVol = 1f; public static ApplicationListener getApp(Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0, boolean value, boolean androidOrientation, int totalRAM, boolean isTablet, int AndroidAPI, String AndroidRelease, String deviceName) { if (GuiBase.getInterface() == null) { @@ -120,9 +118,6 @@ public class Forge implements ApplicationListener { destroyThis = true; //Prevent back() ForgePreferences prefs = new ForgePreferences(); - clipVol = prefs.getPrefInt(FPref.UI_VOL_SOUNDS)/100f; - musicVol = prefs.getPrefInt(FPref.UI_VOL_SOUNDS)/100f; - String skinName; if (FileUtil.doesFileExist(ForgeConstants.MAIN_PREFS_FILE)) { skinName = prefs.getPref(FPref.UI_SKIN); diff --git a/forge-gui-mobile/src/forge/animation/AbilityEffect.java b/forge-gui-mobile/src/forge/animation/AbilityEffect.java index c2a5a61ec17..cb96ab59f30 100644 --- a/forge-gui-mobile/src/forge/animation/AbilityEffect.java +++ b/forge-gui-mobile/src/forge/animation/AbilityEffect.java @@ -1,8 +1,9 @@ package forge.animation; -import forge.Forge; import forge.Graphics; +import forge.model.FModel; import forge.properties.ForgeConstants; +import forge.properties.ForgePreferences; import forge.sound.AudioClip; public enum AbilityEffect { @@ -24,7 +25,7 @@ public enum AbilityEffect { if (soundClip == null) { soundClip = AudioClip.createClip(ForgeConstants.EFFECTS_DIR + wav); } - soundClip.play(Forge.clipVol); + soundClip.play(FModel.getPreferences().getPrefInt(ForgePreferences.FPref.UI_VOL_SOUNDS)/100f); animation.start(); } diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index 485d99e4fb5..a5280d129c8 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -442,19 +442,8 @@ public class SettingsPage extends TabPage { lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_SOUNDS, localizer.getMessage("cbAdjustSoundsVolume"), localizer.getMessage("nlAdjustSoundsVolume"), - new String[]{"0", "25", "50", "75", "100"}) { - @Override - public void valueChanged(String newValue) { - super.valueChanged(newValue); - try { - int val = Integer.parseInt(newValue); - Forge.clipVol = val/100f; - } - catch (Exception e) { - Forge.clipVol = 1f; - } - } - }, 7); + new String[]{"0", "25", "50", "75", "100"}), + 7); lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_MUSIC, localizer.getMessage("cbAdjustMusicVolume"), localizer.getMessage("nlAdjustMusicVolume"), @@ -462,16 +451,8 @@ public class SettingsPage extends TabPage { @Override public void valueChanged(String newValue) { super.valueChanged(newValue); - try { - int val = Integer.parseInt(newValue); - Forge.musicVol = val/100f; - } - catch (Exception e) { - Forge.musicVol = 1f; - } //update background music when this setting changes SoundSystem.instance.changeBackgroundTrack(); - SoundSystem.instance.adjustVolume(Forge.musicVol); } }, 7); } else { diff --git a/forge-gui/src/main/java/forge/sound/SoundSystem.java b/forge-gui/src/main/java/forge/sound/SoundSystem.java index 500bef1d398..92f7dfb1498 100644 --- a/forge-gui/src/main/java/forge/sound/SoundSystem.java +++ b/forge-gui/src/main/java/forge/sound/SoundSystem.java @@ -194,12 +194,6 @@ public class SoundSystem { changeBackgroundTrack(); } - public void adjustVolume(float value) { - if (currentTrack != null) { - currentTrack.setVolume(value); - } - } - public void changeBackgroundTrack() { //ensure old track stopped and disposed of if needed if (currentTrack != null) { @@ -228,6 +222,7 @@ public class SoundSystem { changeBackgroundTrack(); //change track when music completes on its own } }); + currentTrack.setVolume(FModel.getPreferences().getPrefInt(FPref.UI_VOL_MUSIC)/100f); } catch (final Exception ex) { System.err.println("Unable to load music file: " + filename); }