From a1e7cbfba533d62b734305c4ce15c0437ec6c782 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Sun, 4 Aug 2024 22:17:27 -0500
Subject: [PATCH] Cleanup includes and other warnings in new mixer

---
 src/audio/chunk_load.cpp          | 2 --
 src/audio/music_player.cpp        | 8 --------
 src/audio/music_player.hpp        | 2 +-
 src/audio/ogg.hpp                 | 3 +--
 src/audio/ogg_player.cpp          | 2 --
 src/audio/ogg_player.hpp          | 6 ------
 src/audio/resample.cpp            | 1 -
 src/audio/resample.hpp            | 3 ---
 src/audio/sample.hpp              | 2 ++
 src/audio/sound_chunk.hpp         | 2 +-
 src/audio/sound_effect_player.cpp | 4 ----
 src/audio/sound_effect_player.hpp | 2 +-
 src/audio/source.hpp              | 2 --
 src/audio/xmp.hpp                 | 1 -
 14 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/src/audio/chunk_load.cpp b/src/audio/chunk_load.cpp
index 7a3f9b4a3..52e84d1d5 100644
--- a/src/audio/chunk_load.cpp
+++ b/src/audio/chunk_load.cpp
@@ -12,13 +12,11 @@
 
 #include <stb_vorbis.h>
 
-#include "../cxxutil.hpp"
 #include "../io/streams.hpp"
 #include "ogg.hpp"
 #include "ogg_player.hpp"
 #include "resample.hpp"
 #include "sound_chunk.hpp"
-#include "sound_effect_player.hpp"
 #include "wav.hpp"
 #include "wav_player.hpp"
 
diff --git a/src/audio/music_player.cpp b/src/audio/music_player.cpp
index 342d3a6bc..bd85cbf86 100644
--- a/src/audio/music_player.cpp
+++ b/src/audio/music_player.cpp
@@ -14,11 +14,6 @@
 #include <cmath>
 #include <exception>
 #include <optional>
-#include <stdexcept>
-#include <string>
-#include <string_view>
-#include <variant>
-#include <vector>
 
 #include <stb_vorbis.h>
 
@@ -28,11 +23,8 @@
 #include "resample.hpp"
 #include "xmp_player.hpp"
 
-using std::array;
-using std::byte;
 using std::make_unique;
 using std::size_t;
-using std::vector;
 
 using srb2::audio::MusicPlayer;
 using srb2::audio::Resampler;
diff --git a/src/audio/music_player.hpp b/src/audio/music_player.hpp
index 1fae0a599..f9c91429e 100644
--- a/src/audio/music_player.hpp
+++ b/src/audio/music_player.hpp
@@ -29,7 +29,7 @@ enum class MusicType
 	kMod
 };
 
-class MusicPlayer : public Source<2>
+class MusicPlayer final : public Source<2>
 {
 public:
 	MusicPlayer();
diff --git a/src/audio/ogg.hpp b/src/audio/ogg.hpp
index e9d2c0cae..3d9bc4307 100644
--- a/src/audio/ogg.hpp
+++ b/src/audio/ogg.hpp
@@ -12,14 +12,13 @@
 #define __SRB2_AUDIO_OGG_HPP__
 
 #include <exception>
-#include <stdexcept>
 #include <vector>
 
 #include <stb_vorbis.h>
 #include <tcb/span.hpp>
 
 #include "../io/streams.hpp"
-#include "source.hpp"
+#include "sample.hpp"
 
 namespace srb2::audio
 {
diff --git a/src/audio/ogg_player.cpp b/src/audio/ogg_player.cpp
index bc5a9f0c4..71c0f0258 100644
--- a/src/audio/ogg_player.cpp
+++ b/src/audio/ogg_player.cpp
@@ -11,9 +11,7 @@
 #include "ogg_player.hpp"
 
 #include <cmath>
-#include <limits>
 #include <optional>
-#include <stdexcept>
 #include <utility>
 
 using namespace srb2;
diff --git a/src/audio/ogg_player.hpp b/src/audio/ogg_player.hpp
index 4174d658c..5e468fec9 100644
--- a/src/audio/ogg_player.hpp
+++ b/src/audio/ogg_player.hpp
@@ -13,16 +13,10 @@
 
 #include <cstddef>
 #include <optional>
-#include <stdexcept>
-#include <string>
-#include <type_traits>
-#include <variant>
-#include <vector>
 
 #include <stb_vorbis.h>
 #include <tcb/span.hpp>
 
-#include "../io/streams.hpp"
 #include "ogg.hpp"
 #include "source.hpp"
 
diff --git a/src/audio/resample.cpp b/src/audio/resample.cpp
index e61d5c1e5..9b73cb38b 100644
--- a/src/audio/resample.cpp
+++ b/src/audio/resample.cpp
@@ -18,7 +18,6 @@
 
 using std::shared_ptr;
 using std::size_t;
-using std::vector;
 
 using namespace srb2::audio;
 
diff --git a/src/audio/resample.hpp b/src/audio/resample.hpp
index 507fd271f..1f8f3782a 100644
--- a/src/audio/resample.hpp
+++ b/src/audio/resample.hpp
@@ -13,13 +13,10 @@
 
 #include <cmath>
 #include <memory>
-#include <optional>
-#include <variant>
 #include <vector>
 
 #include <tcb/span.hpp>
 
-#include "sound_chunk.hpp"
 #include "source.hpp"
 
 namespace srb2::audio
diff --git a/src/audio/sample.hpp b/src/audio/sample.hpp
index f0fe03f77..46e295d68 100644
--- a/src/audio/sample.hpp
+++ b/src/audio/sample.hpp
@@ -11,7 +11,9 @@
 #ifndef __SRB2_AUDIO_SAMPLE_HPP__
 #define __SRB2_AUDIO_SAMPLE_HPP__
 
+#include <array>
 #include <cstddef>
+#include <cstdint>
 
 namespace srb2::audio
 {
diff --git a/src/audio/sound_chunk.hpp b/src/audio/sound_chunk.hpp
index a06a84688..33da99677 100644
--- a/src/audio/sound_chunk.hpp
+++ b/src/audio/sound_chunk.hpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "source.hpp"
+#include "sample.hpp"
 
 namespace srb2::audio
 {
diff --git a/src/audio/sound_effect_player.cpp b/src/audio/sound_effect_player.cpp
index 7de37c38e..899e61c63 100644
--- a/src/audio/sound_effect_player.cpp
+++ b/src/audio/sound_effect_player.cpp
@@ -10,16 +10,12 @@
 
 #include "sound_effect_player.hpp"
 
-#include <algorithm>
 #include <cmath>
-#include <memory>
 
-using std::shared_ptr;
 using std::size_t;
 
 using srb2::audio::Sample;
 using srb2::audio::SoundEffectPlayer;
-using srb2::audio::Source;
 
 size_t SoundEffectPlayer::generate(tcb::span<Sample<2>> buffer)
 {
diff --git a/src/audio/sound_effect_player.hpp b/src/audio/sound_effect_player.hpp
index e20c83491..c5b0c146d 100644
--- a/src/audio/sound_effect_player.hpp
+++ b/src/audio/sound_effect_player.hpp
@@ -21,7 +21,7 @@
 namespace srb2::audio
 {
 
-class SoundEffectPlayer : public Source<2>
+class SoundEffectPlayer final : public Source<2>
 {
 public:
 	virtual std::size_t generate(tcb::span<Sample<2>> buffer) override final;
diff --git a/src/audio/source.hpp b/src/audio/source.hpp
index 13b52a0c6..2dab24674 100644
--- a/src/audio/source.hpp
+++ b/src/audio/source.hpp
@@ -11,8 +11,6 @@
 #ifndef __SRB2_AUDIO_SOURCE_HPP__
 #define __SRB2_AUDIO_SOURCE_HPP__
 
-#include <array>
-
 #include <tcb/span.hpp>
 
 #include "sample.hpp"
diff --git a/src/audio/xmp.hpp b/src/audio/xmp.hpp
index f36e1a52e..c924a2965 100644
--- a/src/audio/xmp.hpp
+++ b/src/audio/xmp.hpp
@@ -14,7 +14,6 @@
 #include <array>
 #include <cstddef>
 #include <exception>
-#include <stdexcept>
 #include <utility>
 #include <vector>