From eb34a4c0d2130a3edbf69b30f369bdf48380928c Mon Sep 17 00:00:00 2001 From: ExceptNullpointer Date: Sat, 9 Jan 2021 19:01:18 +0300 Subject: [PATCH] Replaced ALTest with AudioSystem class --- .../client/ProgressiaClientMain.java | 2 -- .../progressia/client/audio/AudioSystem.java | 16 ++++++++++ .../ru/windcorp/progressia/test/ALTest.java | 30 ------------------- 3 files changed, 16 insertions(+), 32 deletions(-) create mode 100644 src/main/java/ru/windcorp/progressia/client/audio/AudioSystem.java delete mode 100644 src/main/java/ru/windcorp/progressia/test/ALTest.java diff --git a/src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java b/src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java index 25e19e9..f44cb9b 100644 --- a/src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java +++ b/src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java @@ -18,12 +18,10 @@ package ru.windcorp.progressia.client; import ru.windcorp.progressia.ProgressiaLauncher; -import ru.windcorp.progressia.test.ALTest; public class ProgressiaClientMain { public static void main(String[] args) { - ALTest.execute(); ProgressiaLauncher.launch(args, new ClientProxy()); } diff --git a/src/main/java/ru/windcorp/progressia/client/audio/AudioSystem.java b/src/main/java/ru/windcorp/progressia/client/audio/AudioSystem.java new file mode 100644 index 0000000..4834275 --- /dev/null +++ b/src/main/java/ru/windcorp/progressia/client/audio/AudioSystem.java @@ -0,0 +1,16 @@ +package ru.windcorp.progressia.client.audio; + +public class AudioSystem { + static public void initialize() { + AudioManager.initAL(); + Thread shutdownHook = new Thread(AudioManager::closeAL, "AL Shutdown Hook"); + Runtime.getRuntime().addShutdownHook(shutdownHook); + loadAudioData(); + } + + static void loadAudioData() { + AudioManager.loadSound("assets/sounds/block_destroy_clap.ogg", + "Progressia:BlockDestroy", + AudioFormat.MONO); + } +} \ No newline at end of file diff --git a/src/main/java/ru/windcorp/progressia/test/ALTest.java b/src/main/java/ru/windcorp/progressia/test/ALTest.java deleted file mode 100644 index 45777c5..0000000 --- a/src/main/java/ru/windcorp/progressia/test/ALTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package ru.windcorp.progressia.test; - -import ru.windcorp.progressia.client.audio.AudioFormat; -import ru.windcorp.progressia.client.audio.AudioManager; -import ru.windcorp.progressia.client.audio.Music; - -public class ALTest { - static private void initializeAL() { - AudioManager.initAL(); - } - - static void loadALData() { - AudioManager.loadSound("assets/sounds/sample_stereo.ogg", - "Progressia:SampleStereo", - AudioFormat.STEREO); - AudioManager.loadSound("assets/sounds/block_destroy_clap.ogg", - "Progressia:BlockDestroy", - AudioFormat.MONO); - Music music = new Music("Progressia:SampleStereo"); - music.setGain(0.5f); - //music.play(false); - } - - public static void execute() { - initializeAL(); - Thread shutdownHook = new Thread(AudioManager::closeAL, "AL Shutdown Hook"); - Runtime.getRuntime().addShutdownHook(shutdownHook); - loadALData(); - } -} \ No newline at end of file