github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-08 17:00:07 -09:00
Code Issues Projects Releases Packages Wiki Activity

Some changes to play of audio clips.

Browse source
This commit is contained in:
LevelX2 2014-12-12 18:16:23 +01:00
parent 53421a9719
commit 213275de5a
8 changed files with 14 additions and 7 deletions

BIN
Mage.Client/sounds/OnGameStart.wav Normal file
View file

Binary file not shown.

BIN
Mage.Client/sounds/OnPlayerJoined.wav Normal file
View file

Binary file not shown.

BIN
Mage.Client/sounds/OnPlayerJoinedTable.wav
View file

Binary file not shown.

BIN
Mage.Client/sounds/OnSummon-.wav
View file

Binary file not shown.

BIN
Mage.Client/sounds/OnTournamentStart.wav Normal file
View file

Binary file not shown.

BIN
Mage.Client/sounds/OnYourGameStarted.wav
View file

Binary file not shown.

1
Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
View file

@ -458,6 +458,7 @@ public class CallbackClientImpl implements CallbackClient {
protected void tournamentStarted(UUID tournamentId, UUID playerId) { protected void tournamentStarted(UUID tournamentId, UUID playerId) {
try { try {
frame.showTournament(tournamentId); frame.showTournament(tournamentId);
AudioManager.playTournamentStarted();
logger.info("Tournament " + tournamentId + " started for player " + playerId); logger.info("Tournament " + tournamentId + " started for player " + playerId);
} catch (Exception ex) { } catch (Exception ex) {
handleException(ex); handleException(ex);

20
Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java
View file

@ -43,6 +43,7 @@ public class AudioManager {
private MageClip onCountdown1 = null; private MageClip onCountdown1 = null;
private MageClip onDraftSelect = null; private MageClip onDraftSelect = null;
private MageClip tournamentStarted = null;
private MageClip yourGameStarted = null; private MageClip yourGameStarted = null;
private MageClip playerJoinedTable = null; private MageClip playerJoinedTable = null;
private MageClip playerSubmittedDeck = null; private MageClip playerSubmittedDeck = null;
@ -232,7 +233,7 @@ public class AudioManager {
public static void playPlayerJoinedTable() { public static void playPlayerJoinedTable() {
if (audioManager.playerJoinedTable == null) { 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); AudioGroup.OtherSounds);
} }
checkAndPlayClip(getManager().playerJoinedTable); checkAndPlayClip(getManager().playerJoinedTable);
@ -240,12 +241,18 @@ public class AudioManager {
public static void playYourGameStarted() { public static void playYourGameStarted() {
if (audioManager.yourGameStarted == null) { if (audioManager.yourGameStarted == null) {
audioManager.yourGameStarted = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnYourGameStarted.wav"), audioManager.yourGameStarted = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnGameStart.wav"),
AudioGroup.GameSounds); AudioGroup.OtherSounds);
} }
checkAndPlayClip(getManager().yourGameStarted); 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() { public static void playPlayerWhispered() {
if (audioManager.playerWhispered == null) { if (audioManager.playerWhispered == null) {
audioManager.playerWhispered = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerWhispered.wav"), audioManager.playerWhispered = new MageClip(audioManager.loadClip(Constants.BASE_SOUND_PATH + "OnPlayerWhispered.wav"),
@ -328,7 +335,7 @@ public class AudioManager {
clip.setFramePosition(0); clip.setFramePosition(0);
clip.start(); clip.start();
} }
}).run(); }).start();
} }
private Clip loadClip(String filename) { private Clip loadClip(String filename) {
@ -346,8 +353,7 @@ public class AudioManager {
return clip; return clip;
} catch (Exception e) { } catch (Exception e) {
//e.printStackTrace(); log.error("Couldn't load sound: " + filename + ".", e);
log.error("Couldn't load sound: " + filename + ".");
} }
return null; return null;