From f48cd171e1038831c486f09bd291418095f2485f Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 30 Dec 2024 07:49:46 -0500
Subject: [PATCH] Remove unused audio namespace and clean up includes in APU
 and DSP files

---
 src/app/emu/audio/apu.cc                   | 8 +-------
 src/app/emu/audio/apu.h                    | 8 +-------
 src/app/emu/audio/dsp.cc                   | 5 +----
 src/app/emu/audio/dsp.h                    | 5 +----
 src/app/emu/audio/internal/addressing.cc   | 5 +----
 src/app/emu/audio/internal/instructions.cc | 5 +----
 src/app/emu/audio/spc700.cc                | 4 ----
 src/app/emu/audio/spc700.h                 | 8 ++------
 8 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/app/emu/audio/apu.cc b/src/app/emu/audio/apu.cc
index b8adb0ff..3d51a955 100644
--- a/src/app/emu/audio/apu.cc
+++ b/src/app/emu/audio/apu.cc
@@ -3,18 +3,14 @@
 #include <SDL.h>
 
 #include <cstdint>
-#include <functional>
-#include <iostream>
 #include <vector>
 
 #include "app/emu/audio/dsp.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 
 namespace yaze {
 namespace emu {
-namespace audio {
 
 static const double apuCyclesPerMaster = (32040 * 32) / (1364 * 262 * 60.0);
 static const double apuCyclesPerMasterPal = (32040 * 32) / (1364 * 312 * 50.0);
@@ -200,7 +196,5 @@ void Apu::SpcWrite(uint16_t adr, uint8_t val) {
 
 void Apu::SpcIdle(bool waiting) { Cycle(); }
 
-}  // namespace audio
 }  // namespace emu
-
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/emu/audio/apu.h b/src/app/emu/audio/apu.h
index 35260e0a..b971a0e2 100644
--- a/src/app/emu/audio/apu.h
+++ b/src/app/emu/audio/apu.h
@@ -2,7 +2,6 @@
 #define YAZE_APP_EMU_APU_H_
 
 #include <cstdint>
-#include <iostream>
 #include <vector>
 #include <array>
 
@@ -12,9 +11,6 @@
 
 namespace yaze {
 namespace emu {
-namespace audio {
-
-using namespace memory;
 
 typedef struct Timer {
   uint8_t cycles;
@@ -92,9 +88,7 @@ class Apu {
   Spc700 spc700_{callbacks_};
 };
 
-}  // namespace audio
 }  // namespace emu
-
 }  // namespace yaze
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/app/emu/audio/dsp.cc b/src/app/emu/audio/dsp.cc
index 610ddb21..7281d025 100644
--- a/src/app/emu/audio/dsp.cc
+++ b/src/app/emu/audio/dsp.cc
@@ -6,7 +6,6 @@
 
 namespace yaze {
 namespace emu {
-namespace audio {
 
 static const int rateValues[32] = {0,   2048, 1536, 1280, 1024, 768, 640, 512,
                                    384, 320,  256,  192,  160,  128, 96,  80,
@@ -630,7 +629,5 @@ void Dsp::GetSamples(int16_t* sample_data, int samples_per_frame,
   }
 }
 
-}  // namespace audio
 }  // namespace emu
-
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/emu/audio/dsp.h b/src/app/emu/audio/dsp.h
index 93071b9b..647397ee 100644
--- a/src/app/emu/audio/dsp.h
+++ b/src/app/emu/audio/dsp.h
@@ -10,7 +10,6 @@
 
 namespace yaze {
 namespace emu {
-namespace audio {
 
 typedef struct DspChannel {
   // pitch
@@ -154,9 +153,7 @@ class Dsp {
   uint32_t lastFrameBoundary;
 };
 
-}  // namespace audio
 }  // namespace emu
-
 }  // namespace yaze
 
-#endif  // YAZE_APP_EMU_AUDIO_S_DSP_H
\ No newline at end of file
+#endif  // YAZE_APP_EMU_AUDIO_S_DSP_H
diff --git a/src/app/emu/audio/internal/addressing.cc b/src/app/emu/audio/internal/addressing.cc
index 8c3154ef..71ff2f49 100644
--- a/src/app/emu/audio/internal/addressing.cc
+++ b/src/app/emu/audio/internal/addressing.cc
@@ -2,7 +2,6 @@
 
 namespace yaze {
 namespace emu {
-namespace audio {
 
 // adressing modes
 
@@ -145,7 +144,5 @@ uint16_t Spc700::addr_plus_i_indexed() {
   return read(addr) | (read(addr + 1) << 8);
 }
 
-}  // namespace audio
 }  // namespace emu
-
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/emu/audio/internal/instructions.cc b/src/app/emu/audio/internal/instructions.cc
index e358ea2a..b8d456a4 100644
--- a/src/app/emu/audio/internal/instructions.cc
+++ b/src/app/emu/audio/internal/instructions.cc
@@ -2,7 +2,6 @@
 
 namespace yaze {
 namespace emu {
-namespace audio {
 
 // opcode functions
 
@@ -480,7 +479,5 @@ void Spc700::SLEEP() {}
 
 void Spc700::STOP() {}
 
-}  // namespace audio
 }  // namespace emu
-
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/emu/audio/spc700.cc b/src/app/emu/audio/spc700.cc
index 38bd67e3..88fb20d6 100644
--- a/src/app/emu/audio/spc700.cc
+++ b/src/app/emu/audio/spc700.cc
@@ -4,13 +4,11 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <vector>
 
 #include "app/emu/audio/internal/opcodes.h"
 
 namespace yaze {
 namespace emu {
-namespace audio {
 
 void Spc700::Reset(bool hard) {
   if (hard) {
@@ -1323,7 +1321,5 @@ void Spc700::LogInstruction(uint16_t initial_pc, uint8_t opcode) {
   // log_.push_back(log_entry);
 }
 
-}  // namespace audio
 }  // namespace emu
-
 }  // namespace yaze
diff --git a/src/app/emu/audio/spc700.h b/src/app/emu/audio/spc700.h
index 9717c7d9..baa790e5 100644
--- a/src/app/emu/audio/spc700.h
+++ b/src/app/emu/audio/spc700.h
@@ -3,13 +3,10 @@
 
 #include <cstdint>
 #include <functional>
-#include <iostream>
-#include <unordered_map>
 #include <vector>
 
 namespace yaze {
 namespace emu {
-namespace audio {
 
 /**
  * @brief AudioRam is an interface for the Audio RAM used by the SPC700.
@@ -336,8 +333,7 @@ class Spc700 {
   // CBNE DBNZ
 };
 
-}  // namespace audio
 }  // namespace emu
-
 }  // namespace yaze
-#endif  // YAZE_APP_EMU_SPC700_H
\ No newline at end of file
+
+#endif  // YAZE_APP_EMU_SPC700_H