stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed VOLUME to MASTERVOLUME for better naming

Browse Source
This commit is contained in:
lieght
2025-10-12 01:02:58 +02:00
parent ca25338971
commit 7631a10838
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/toop/Main.java
View File

@@ -26,8 +26,8 @@ public final class Main {
mm, mm,
sem, sem,
new AudioVolumeManager() new AudioVolumeManager()
.registerManager(VolumeTypes.VOLUME, mm) .registerManager(VolumeTypes.MASTERVOLUME, mm)
.registerManager(VolumeTypes.VOLUME, sem) .registerManager(VolumeTypes.MASTERVOLUME, sem)
.registerManager(VolumeTypes.FX, sem) .registerManager(VolumeTypes.FX, sem)
.registerManager(VolumeTypes.MUSIC, mm) .registerManager(VolumeTypes.MUSIC, mm)
); a.initListeners(); ); a.initListeners();

4
framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
View File

@@ -56,7 +56,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
} }
private void handleVolumeChange(AudioEvents.ChangeVolume event) { private void handleVolumeChange(AudioEvents.ChangeVolume event) {
this.audioVolumeManager.setVolume(event.newVolume() / 100, VolumeTypes.VOLUME); this.audioVolumeManager.setVolume(event.newVolume() / 100, VolumeTypes.MASTERVOLUME);
this.audioVolumeManager.updateAllVolumes(); this.audioVolumeManager.updateAllVolumes();
} }
@@ -74,7 +74,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
new EventFlow() new EventFlow()
.addPostEvent( .addPostEvent(
new AudioEvents.GetCurrentVolumeResponse( new AudioEvents.GetCurrentVolumeResponse(
audioVolumeManager.getVolume(VolumeTypes.VOLUME), audioVolumeManager.getVolume(VolumeTypes.MASTERVOLUME),
event.snowflakeId())) event.snowflakeId()))
.asyncPostEvent(); .asyncPostEvent();
} }

6
framework/src/main/java/org/toop/framework/audio/AudioVolumeManager.java
View File

@@ -7,7 +7,7 @@ import org.toop.framework.resource.types.AudioResource;
public class AudioVolumeManager implements VolumeManager { public class AudioVolumeManager implements VolumeManager {
public void setVolume(double newVolume, VolumeTypes type) { public void setVolume(double newVolume, VolumeTypes type) {
type.setVolume(newVolume, VolumeTypes.VOLUME.getVolume()); type.setVolume(newVolume, VolumeTypes.MASTERVOLUME.getVolume());
} }
public double getVolume(VolumeTypes type) { public double getVolume(VolumeTypes type) {
@@ -23,10 +23,10 @@ public class AudioVolumeManager implements VolumeManager {
@Override @Override
public void updateAllVolumes() { public void updateAllVolumes() {
double masterVolume = VolumeTypes.VOLUME.getVolume(); double masterVolume = VolumeTypes.MASTERVOLUME.getVolume();
for (VolumeTypes type : VolumeTypes.values()) { for (VolumeTypes type : VolumeTypes.values()) {
if (type != VolumeTypes.VOLUME) { // skip master itself if (type != VolumeTypes.MASTERVOLUME) { // skip master itself
type.setVolume(type.getVolume(), masterVolume); type.setVolume(type.getVolume(), masterVolume);
} }
} }

6
framework/src/main/java/org/toop/framework/audio/VolumeTypes.java
View File

@@ -9,7 +9,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
public enum VolumeTypes { public enum VolumeTypes {
VOLUME(), MASTERVOLUME(),
FX(), FX(),
MUSIC(); MUSIC();
@@ -20,7 +20,7 @@ public enum VolumeTypes {
public void setVolume(double newVolume, double currentMasterVolume) { public void setVolume(double newVolume, double currentMasterVolume) {
this.volume = clamp(newVolume); this.volume = clamp(newVolume);
if (this != VOLUME) { if (this != MASTERVOLUME) {
this.masterVolume = clamp(currentMasterVolume); this.masterVolume = clamp(currentMasterVolume);
} }
@@ -29,7 +29,7 @@ public enum VolumeTypes {
} }
private double computeEffectiveVolume() { private double computeEffectiveVolume() {
return (this == VOLUME) ? volume : volume * masterVolume; return (this == MASTERVOLUME) ? volume : volume * masterVolume;
} }
private void broadcastVolume(double effectiveVolume) { private void broadcastVolume(double effectiveVolume) {

5
framework/src/main/java/org/toop/framework/resource/resources/MusicAsset.java
View File

@@ -11,7 +11,6 @@ import org.toop.framework.resource.types.LoadableResource;
public class MusicAsset extends BaseResource implements LoadableResource, AudioResource { public class MusicAsset extends BaseResource implements LoadableResource, AudioResource {
private MediaPlayer mediaPlayer; private MediaPlayer mediaPlayer;
private double volume; private double volume;
private boolean isPlaying = false;
public MusicAsset(final File audioFile) { public MusicAsset(final File audioFile) {
super(audioFile); super(audioFile);
@@ -25,7 +24,7 @@ public class MusicAsset extends BaseResource implements LoadableResource, AudioR
private void initPlayer() { private void initPlayer() {
mediaPlayer.setOnEndOfMedia(this::stop); mediaPlayer.setOnEndOfMedia(this::stop);
mediaPlayer.setOnError(this::stop); mediaPlayer.setOnError(this::stop);
mediaPlayer.setOnStopped(() -> isPlaying = false); mediaPlayer.setOnStopped(null);
} }
@Override @Override
@@ -74,12 +73,10 @@ public class MusicAsset extends BaseResource implements LoadableResource, AudioR
@Override @Override
public void play() { public void play() {
getMediaPlayer().play(); getMediaPlayer().play();
isPlaying = true;
} }
@Override @Override
public void stop() { public void stop() {
getMediaPlayer().stop(); getMediaPlayer().stop();
isPlaying = false;
} }
} }