move sound code to io

11 files changed, 10 insertions, 14 deletions

diff --git a/src/game/client/CMakeLists.txt b/src/game/client/CMakeLists.txt
index af30497..c4c6453 100644
--- a/src/game/client/CMakeLists.txt
+++ b/src/game/client/CMakeLists.txt
@@ -30,7 +30,6 @@ add_subdirectory(entity)
 add_subdirectory(gui)
 add_subdirectory(io)
 add_subdirectory(resource)
-add_subdirectory(sound)
 add_subdirectory(world)
 
 if(WIN32 AND MSVC)
diff --git a/src/game/client/entity/listener.cc b/src/game/client/entity/listener.cc
index 991f014..af574ae 100644
--- a/src/game/client/entity/listener.cc
+++ b/src/game/client/entity/listener.cc
@@ -12,7 +12,7 @@
 
 #include "client/entity/camera.hh"
 
-#include "client/sound/sound.hh"
+#include "client/io/sound.hh"
 
 #include "client/const.hh"
 #include "client/globals.hh"
diff --git a/src/game/client/entity/player_move.cc b/src/game/client/entity/player_move.cc
index edf9150..fe4e757 100644
--- a/src/game/client/entity/player_move.cc
+++ b/src/game/client/entity/player_move.cc
@@ -27,7 +27,7 @@
 
 #include "client/io/gamepad.hh"
 
-#include "client/sound/sound.hh"
+#include "client/io/sound.hh"
 
 #include "client/world/voxel_sounds.hh"
 
diff --git a/src/game/client/entity/sound_emitter.cc b/src/game/client/entity/sound_emitter.cc
index 79b5ab0..b0dbc6d 100644
--- a/src/game/client/entity/sound_emitter.cc
+++ b/src/game/client/entity/sound_emitter.cc
@@ -15,7 +15,7 @@
 
 #include "client/entity/camera.hh"
 
-#include "client/sound/sound.hh"
+#include "client/io/sound.hh"
 
 #include "client/globals.hh"
 
diff --git a/src/game/client/game.cc b/src/game/client/game.cc
index 9ade30f..6219ff9 100644
--- a/src/game/client/game.cc
+++ b/src/game/client/game.cc
@@ -63,11 +63,10 @@
 
 #include "client/io/gamepad.hh"
 #include "client/io/glfw.hh"
+#include "client/io/sound.hh"
 
 #include "client/resource/texture_gui.hh"
 
-#include "client/sound/sound.hh"
-
 #include "client/world/chunk_mesher.hh"
 #include "client/world/chunk_renderer.hh"
 #include "client/world/chunk_visibility.hh"
diff --git a/src/game/client/gui/chat.cc b/src/game/client/gui/chat.cc
index 76260af..f962e5d 100644
--- a/src/game/client/gui/chat.cc
+++ b/src/game/client/gui/chat.cc
@@ -21,11 +21,10 @@
 #include "client/gui/settings.hh"
 
 #include "client/io/glfw.hh"
+#include "client/io/sound.hh"
 
 #include "client/resource/sound_effect.hh"
 
-#include "client/sound/sound.hh"
-
 #include "client/game.hh"
 #include "client/globals.hh"
 #include "client/session.hh"
diff --git a/src/game/client/io/CMakeLists.txt b/src/game/client/io/CMakeLists.txt
index 82bc422..a68f137 100644
--- a/src/game/client/io/CMakeLists.txt
+++ b/src/game/client/io/CMakeLists.txt
@@ -1,4 +1,6 @@
 target_sources(vclient PRIVATE
     "${CMAKE_CURRENT_LIST_DIR}/gamepad.cc"
     "${CMAKE_CURRENT_LIST_DIR}/gamepad.hh"
-    "${CMAKE_CURRENT_LIST_DIR}/glfw.hh")
+    "${CMAKE_CURRENT_LIST_DIR}/glfw.hh"
+    "${CMAKE_CURRENT_LIST_DIR}/sound.cc"
+    "${CMAKE_CURRENT_LIST_DIR}/sound.hh")
diff --git a/src/game/client/sound/sound.cc b/src/game/client/io/sound.cc
index 11c9286..e67c456 100644
--- a/src/game/client/sound/sound.cc
+++ b/src/game/client/io/sound.cc
@@ -1,6 +1,6 @@
 #include "client/pch.hh"
 
-#include "client/sound/sound.hh"
+#include "client/io/sound.hh"
 
 #include "core/config/number.hh"
 
diff --git a/src/game/client/sound/sound.hh b/src/game/client/io/sound.hh
index d96d0c4..d96d0c4 100644
--- a/src/game/client/sound/sound.hh
+++ b/src/game/client/io/sound.hh
diff --git a/src/game/client/receive.cc b/src/game/client/receive.cc
index a6fdf8e..bc7b92e 100644
--- a/src/game/client/receive.cc
+++ b/src/game/client/receive.cc
@@ -18,7 +18,7 @@
 #include "client/gui/message_box.hh"
 #include "client/gui/window_title.hh"
 
-#include "client/sound/sound.hh"
+#include "client/io/sound.hh"
 
 #include "client/globals.hh"
 #include "client/session.hh"
diff --git a/src/game/client/sound/CMakeLists.txt b/src/game/client/sound/CMakeLists.txt
deleted file mode 100644
index 4b577d3..0000000
--- a/src/game/client/sound/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-target_sources(vclient PRIVATE
-    "${CMAKE_CURRENT_LIST_DIR}/sound.cc"
-    "${CMAKE_CURRENT_LIST_DIR}/sound.hh")