From 08b5fff65debf990ebb68f90ef92dba1f5baab4d Mon Sep 17 00:00:00 2001 From: UnicornFreedom Date: Mon, 9 Oct 2023 16:01:52 +0200 Subject: [PATCH] Move OpenAl exception to the audio package --- src/main/scala/ocelot/desktop/audio/AL10W.scala | 2 +- src/main/scala/ocelot/desktop/audio/Audio.scala | 2 +- .../scala/ocelot/desktop/{util => audio}/OpenAlException.scala | 2 +- src/main/scala/ocelot/desktop/audio/SoundBuffer.scala | 2 +- src/main/scala/ocelot/desktop/audio/SoundSamples.scala | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/main/scala/ocelot/desktop/{util => audio}/OpenAlException.scala (92%) diff --git a/src/main/scala/ocelot/desktop/audio/AL10W.scala b/src/main/scala/ocelot/desktop/audio/AL10W.scala index 26c7d85..3b0c7ee 100644 --- a/src/main/scala/ocelot/desktop/audio/AL10W.scala +++ b/src/main/scala/ocelot/desktop/audio/AL10W.scala @@ -1,7 +1,7 @@ package ocelot.desktop.audio import ocelot.desktop.Settings -import ocelot.desktop.util.{Logging, OpenAlException} +import ocelot.desktop.util.Logging import org.lwjgl.openal.AL10 import java.nio.{ByteBuffer, IntBuffer} diff --git a/src/main/scala/ocelot/desktop/audio/Audio.scala b/src/main/scala/ocelot/desktop/audio/Audio.scala index bb01d83..1002152 100644 --- a/src/main/scala/ocelot/desktop/audio/Audio.scala +++ b/src/main/scala/ocelot/desktop/audio/Audio.scala @@ -1,7 +1,7 @@ package ocelot.desktop.audio import ocelot.desktop.Settings -import ocelot.desktop.util.{Logging, OpenAlException, Transaction} +import ocelot.desktop.util.{Logging, Transaction} import org.lwjgl.LWJGLException import org.lwjgl.openal.{AL, AL10, ALC10} diff --git a/src/main/scala/ocelot/desktop/util/OpenAlException.scala b/src/main/scala/ocelot/desktop/audio/OpenAlException.scala similarity index 92% rename from src/main/scala/ocelot/desktop/util/OpenAlException.scala rename to src/main/scala/ocelot/desktop/audio/OpenAlException.scala index 5ff4a83..d301d1d 100644 --- a/src/main/scala/ocelot/desktop/util/OpenAlException.scala +++ b/src/main/scala/ocelot/desktop/audio/OpenAlException.scala @@ -1,4 +1,4 @@ -package ocelot.desktop.util +package ocelot.desktop.audio import scala.util.control import scala.util.control.Exception.Catch diff --git a/src/main/scala/ocelot/desktop/audio/SoundBuffer.scala b/src/main/scala/ocelot/desktop/audio/SoundBuffer.scala index bacd9f4..d11dd7f 100644 --- a/src/main/scala/ocelot/desktop/audio/SoundBuffer.scala +++ b/src/main/scala/ocelot/desktop/audio/SoundBuffer.scala @@ -1,6 +1,6 @@ package ocelot.desktop.audio -import ocelot.desktop.util.{FileUtils, Logging, OpenAlException, Resource} +import ocelot.desktop.util.{FileUtils, Logging, Resource} import org.lwjgl.openal.AL10 class SoundBuffer(val file: String) extends Resource with Logging { diff --git a/src/main/scala/ocelot/desktop/audio/SoundSamples.scala b/src/main/scala/ocelot/desktop/audio/SoundSamples.scala index 6fddac2..db8d215 100644 --- a/src/main/scala/ocelot/desktop/audio/SoundSamples.scala +++ b/src/main/scala/ocelot/desktop/audio/SoundSamples.scala @@ -1,6 +1,6 @@ package ocelot.desktop.audio -import ocelot.desktop.util.{Logging, OpenAlException} +import ocelot.desktop.util.Logging import org.lwjgl.openal.AL10 import java.nio.ByteBuffer