diff --git a/Mage.Client/sounds/OnGameStart.wav b/Mage.Client/sounds/OnGameStart.wav new file mode 100644 index 00000000000..791a85b591a Binary files /dev/null and b/Mage.Client/sounds/OnGameStart.wav differ diff --git a/Mage.Client/sounds/OnPlayerJoined.wav b/Mage.Client/sounds/OnPlayerJoined.wav new file mode 100644 index 00000000000..0182728328d Binary files /dev/null and b/Mage.Client/sounds/OnPlayerJoined.wav differ diff --git a/Mage.Client/sounds/OnPlayerJoinedTable.wav b/Mage.Client/sounds/OnPlayerJoinedTable.wav deleted file mode 100644 index a8c11bb354e..00000000000 Binary files a/Mage.Client/sounds/OnPlayerJoinedTable.wav and /dev/null differ diff --git a/Mage.Client/sounds/OnSummon-.wav b/Mage.Client/sounds/OnSummon-.wav deleted file mode 100644 index 1facee015c8..00000000000 Binary files a/Mage.Client/sounds/OnSummon-.wav and /dev/null differ diff --git a/Mage.Client/sounds/OnTournamentStart.wav b/Mage.Client/sounds/OnTournamentStart.wav new file mode 100644 index 00000000000..a6aa47f24fc Binary files /dev/null and b/Mage.Client/sounds/OnTournamentStart.wav differ diff --git a/Mage.Client/sounds/OnYourGameStarted.wav b/Mage.Client/sounds/OnYourGameStarted.wav deleted file mode 100644 index 68f12d95d7c..00000000000 Binary files a/Mage.Client/sounds/OnYourGameStarted.wav and /dev/null differ diff --git a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java index 519010f36ca..01869c84ba0 100644 --- a/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java +++ b/Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java @@ -458,6 +458,7 @@ public class CallbackClientImpl implements CallbackClient { protected void tournamentStarted(UUID tournamentId, UUID playerId) { try { frame.showTournament(tournamentId); + AudioManager.playTournamentStarted(); logger.info("Tournament " + tournamentId + " started for player " + playerId); } catch (Exception ex) { handleException(ex); diff --git a/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java b/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java index e9e7aace901..9e9dd416a29 100644 --- a/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java +++ b/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java @@ -43,6 +43,7 @@ public class AudioManager { private MageClip onCountdown1 = null; private MageClip onDraftSelect = null; + private MageClip tournamentStarted = null; private MageClip yourGameStarted = null; private MageClip playerJoinedTable = null; private MageClip playerSubmittedDeck = null; @@ -232,7 +233,7 @@ public class AudioManager { public static void playPlayerJoinedTable() { if (audioManager.playerJoinedTable == null) { - audioManager.playerJoinedTable = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerJoinedTable.wav"), + audioManager.playerJoinedTable = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerJoined.wav"), AudioGroup.OtherSounds); } checkAndPlayClip(getManager().playerJoinedTable); @@ -240,12 +241,18 @@ public class AudioManager { public static void playYourGameStarted() { if (audioManager.yourGameStarted == null) { - audioManager.yourGameStarted = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnYourGameStarted.wav"), - AudioGroup.GameSounds); + audioManager.yourGameStarted = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnGameStart.wav"), + AudioGroup.OtherSounds); } checkAndPlayClip(getManager().yourGameStarted); } - + public static void playTournamentStarted() { + if (audioManager.tournamentStarted == null) { + audioManager.tournamentStarted = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnTournamentStart.wav"), + AudioGroup.OtherSounds); + } + checkAndPlayClip(getManager().tournamentStarted); + } public static void playPlayerWhispered() { if (audioManager.playerWhispered == null) { audioManager.playerWhispered = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerWhispered.wav"), @@ -328,7 +335,7 @@ public class AudioManager { clip.setFramePosition(0); clip.start(); } - }).run(); + }).start(); } private Clip loadClip(String filename) { @@ -346,8 +353,7 @@ public class AudioManager { return clip; } catch (Exception e) { - //e.printStackTrace(); - log.error("Couldn't load sound: " + filename + "."); + log.error("Couldn't load sound: " + filename + ".", e); } return null;