Merge pull request #111 from einaskoi/einar/AudioRefactor

improved sfx and replaced music as well as minor bug fixes

src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/Audio.java

@@ -5,12 +5,11 @@ public enum Audio {
   // Sound effects
   OPEN_APP("/Audio/open_app.wav", true),
   CLOSE_APP("/Audio/close_app.wav", true),
-  WARNING("/Audio/warning.wav", true),
   CLOCK("/Audio/clock.wav", true),
 
   // Background music
-  WEEKEND_THEME("/Audio/weekend_theme.mp3", false),
-  GAME_OVER_THEME("/Audio/game_over_theme.mp3", false);
+  WORK_THEME("/Audio/work_theme.mp3", false),
+  WEEKEND_THEME("/Audio/weekend_theme.mp3", false);
 
   private String path;
   private boolean isSFX;

src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/AudioManager.java

@@ -51,7 +51,6 @@ public void playBgMusic(Audio audio) {
     stopBgMusic();
     var url = getClass().getResource(audio.getPath()).toExternalForm();
     bgPlayer = new MediaPlayer(new Media(url));
-    bgPlayer.setCycleCount(MediaPlayer.INDEFINITE);
     bgPlayer.setVolume(0.5);
     bgPlayer.play();
   }

src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/GameController.java

@@ -34,12 +34,12 @@ public void setGameState(GameState gameState) {
     this.gameState = gameState;
 
     if (gameState == GameState.WORKDAY && !workMusicPlaying) {
-      //audioManager.playBgMusic(Audio.WORK_THEME);
+      audioManager.playBgMusic(Audio.WORK_THEME);
       workMusicPlaying = true;
       weekendMusicPlaying = false;
     }
 
-    if ((gameState == GameState.RENTDAY || gameState == GameState.FREEDAY) && !weekendMusicPlaying) {
+    if ((gameState == GameState.FREEDAY) && !weekendMusicPlaying) {
       audioManager.playBgMusic(Audio.WEEKEND_THEME);
       weekendMusicPlaying = true;
       workMusicPlaying = false;
@@ -52,7 +52,7 @@ public void setGameState(GameState gameState) {
   public void startGame() {
     timer = new Timer(true);
     final int delay = 0;
-    final int period = 10; //TODO: This has to be 1000 (1 second) on release
+    final int period = 1000; //TODO: This has to be 1000 (1 second) on release
 
     timer.scheduleAtFixedRate(
         new TimerTask() {

src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java

@@ -62,7 +62,6 @@ public final class DesktopViewController {
   private final GameOverApp gameOverApp = new GameOverApp();
 
   private Runnable onGameOver;
-  private AudioManager audioManager = AudioManager.getInstance();
 
   public DesktopViewController(final Player player, final GameController gameController) {
     this.player = player;
@@ -211,7 +210,6 @@ private void showMarketClosedWarning() {
 
   private void showWarning() {
     warningApp.show();
-    audioManager.playSFX(Audio.WARNING);
     desktopView.enterLayer(ModalLayer.WARNING);
   }
 
@@ -222,7 +220,6 @@ private void dismissWarning() {
 
   private void showGameOver() {
     gameOverApp.show();
-    audioManager.playBgMusic(Audio.GAME_OVER_THEME);
     desktopView.enterLayer(ModalLayer.GAME_OVER);
   }