Cleanup includes and other warnings in new mixer

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"
 

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;

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();

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
 {

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;

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"
 

src/audio/resample.cpp

@@ -18,7 +18,6 @@
 
 using std::shared_ptr;
 using std::size_t;
-using std::vector;
 
 using namespace srb2::audio;
 

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

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
 {

src/audio/sound_chunk.hpp

@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "source.hpp"
+#include "sample.hpp"
 
 namespace srb2::audio
 {

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)
 {

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;

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"

src/audio/xmp.hpp

@@ -14,7 +14,6 @@
 #include <array>
 #include <cstddef>
 #include <exception>
-#include <stdexcept>
 #include <utility>
 #include <vector>