From 0f182cd419a106b8c76b7de81c36d97c1b40d8e5 Mon Sep 17 00:00:00 2001
From: Rasmus <rburwitz@uni-bremen.de>
Date: Mon, 20 Jul 2020 14:49:57 +0200
Subject: [PATCH] mute, volumeUp and Down works
---
.../galaxytruckerreloaded/Controller/AudioController.java | 3 ++-
.../InGameButtons/OptionButtons/Audio/MuteButton.java | 6 ++++--
.../InGameButtons/OptionButtons/Audio/VolumeDownButton.java | 3 ++-
.../InGameButtons/OptionButtons/Audio/VolumeUpButton.java | 3 ++-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/AudioController.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/AudioController.java
index 70f7d2bd..222af2a2 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/AudioController.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/AudioController.java
@@ -36,6 +36,7 @@ public class AudioController extends Controller /**implements Audio*/ {
public void setMusic(FileHandle file){
if(music == null) {
music = Gdx.audio.newMusic(file);
+ music.setVolume(0.5f);
music.setLooping(true);
music.play();
}
@@ -46,7 +47,7 @@ public class AudioController extends Controller /**implements Audio*/ {
music.play();
}
public void mute(){
- music.pause();
+ music.stop();
}
public void volumeUp(){
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/MuteButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/MuteButton.java
index 14f3c2f3..0bf90b74 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/MuteButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/MuteButton.java
@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.audio.*;
+import com.galaxytrucker.galaxytruckerreloaded.Controller.AudioController;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
@@ -26,7 +27,8 @@ public class MuteButton extends ImButton {
@Override
public void leftClick(){
- //gamesound pausieren
- return;
+ if(AudioController.getInstance().getMusic().isPlaying()){
+ AudioController.getInstance().mute();
+ } else AudioController.getInstance().play();
}
}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeDownButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeDownButton.java
index b424c43d..d722da96 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeDownButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeDownButton.java
@@ -4,6 +4,7 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.galaxytrucker.galaxytruckerreloaded.Controller.AudioController;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
@@ -24,6 +25,6 @@ public class VolumeDownButton extends ImButton {
@Override
public void leftClick() {
- //lower sound voulme
+ AudioController.getInstance().volumeDown();
}
}
\ No newline at end of file
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeUpButton.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeUpButton.java
index 442b0668..ee176649 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeUpButton.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/OptionButtons/Audio/VolumeUpButton.java
@@ -4,6 +4,7 @@ import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.galaxytrucker.galaxytruckerreloaded.Controller.AudioController;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
@@ -24,7 +25,7 @@ public class VolumeUpButton extends ImButton {
@Override
public void leftClick(){
- //rise sound voulme
+ AudioController.getInstance().volumeUp();
}
}
--
GitLab