scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused audio namespace and clean up includes in APU and DSP files

Browse Source
This commit is contained in:
scawful
2024-12-30 07:49:46 -05:00
parent 80d3bf4273
commit f48cd171e1
8 changed files with 8 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/emu/audio/apu.cc
View File

@@ -3,18 +3,14 @@
#include <SDL.h> #include <SDL.h>
#include <cstdint> #include <cstdint>
#include <functional>
#include <iostream>
#include <vector> #include <vector>
#include "app/emu/audio/dsp.h" #include "app/emu/audio/dsp.h"
#include "app/emu/audio/spc700.h" #include "app/emu/audio/spc700.h"
#include "app/emu/cpu/clock.h"
#include "app/emu/memory/memory.h" #include "app/emu/memory/memory.h"
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
static const double apuCyclesPerMaster = (32040 * 32) / (1364 * 262 * 60.0); static const double apuCyclesPerMaster = (32040 * 32) / (1364 * 262 * 60.0);
static const double apuCyclesPerMasterPal = (32040 * 32) / (1364 * 312 * 50.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(); } void Apu::SpcIdle(bool waiting) { Cycle(); }
} // namespace audio
} // namespace emu } // namespace emu
} // namespace yaze } // namespace yaze

6
src/app/emu/audio/apu.h
View File

@@ -2,7 +2,6 @@
#define YAZE_APP_EMU_APU_H_ #define YAZE_APP_EMU_APU_H_
#include <cstdint> #include <cstdint>
#include <iostream>
#include <vector> #include <vector>
#include <array> #include <array>
@@ -12,9 +11,6 @@
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
using namespace memory;
typedef struct Timer { typedef struct Timer {
uint8_t cycles; uint8_t cycles;
@@ -92,9 +88,7 @@ class Apu {
Spc700 spc700_{callbacks_}; Spc700 spc700_{callbacks_};
}; };
} // namespace audio
} // namespace emu } // namespace emu
} // namespace yaze } // namespace yaze
#endif #endif

3
src/app/emu/audio/dsp.cc
View File

@@ -6,7 +6,6 @@
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
static const int rateValues[32] = {0, 2048, 1536, 1280, 1024, 768, 640, 512, static const int rateValues[32] = {0, 2048, 1536, 1280, 1024, 768, 640, 512,
384, 320, 256, 192, 160, 128, 96, 80, 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 emu
} // namespace yaze } // namespace yaze

3
src/app/emu/audio/dsp.h
View File

@@ -10,7 +10,6 @@
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
typedef struct DspChannel { typedef struct DspChannel {
// pitch // pitch
@@ -154,9 +153,7 @@ class Dsp {
uint32_t lastFrameBoundary; uint32_t lastFrameBoundary;
}; };
} // namespace audio
} // namespace emu } // namespace emu
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_EMU_AUDIO_S_DSP_H #endif // YAZE_APP_EMU_AUDIO_S_DSP_H

3
src/app/emu/audio/internal/addressing.cc
View File

@@ -2,7 +2,6 @@
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
// adressing modes // adressing modes
@@ -145,7 +144,5 @@ uint16_t Spc700::addr_plus_i_indexed() {
return read(addr) | (read(addr + 1) << 8); return read(addr) | (read(addr + 1) << 8);
} }
} // namespace audio
} // namespace emu } // namespace emu
} // namespace yaze } // namespace yaze

3
src/app/emu/audio/internal/instructions.cc
View File

@@ -2,7 +2,6 @@
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
// opcode functions // opcode functions
@@ -480,7 +479,5 @@ void Spc700::SLEEP() {}
void Spc700::STOP() {} void Spc700::STOP() {}
} // namespace audio
} // namespace emu } // namespace emu
} // namespace yaze } // namespace yaze

4
src/app/emu/audio/spc700.cc
View File

@@ -4,13 +4,11 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <vector>
#include "app/emu/audio/internal/opcodes.h" #include "app/emu/audio/internal/opcodes.h"
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
void Spc700::Reset(bool hard) { void Spc700::Reset(bool hard) {
if (hard) { if (hard) {
@@ -1323,7 +1321,5 @@ void Spc700::LogInstruction(uint16_t initial_pc, uint8_t opcode) {
// log_.push_back(log_entry); // log_.push_back(log_entry);
} }
} // namespace audio
} // namespace emu } // namespace emu
} // namespace yaze } // namespace yaze

6
src/app/emu/audio/spc700.h
View File

@@ -3,13 +3,10 @@
#include <cstdint> #include <cstdint>
#include <functional> #include <functional>
#include <iostream>
#include <unordered_map>
#include <vector> #include <vector>
namespace yaze { namespace yaze {
namespace emu { namespace emu {
namespace audio {
/** /**
* @brief AudioRam is an interface for the Audio RAM used by the SPC700. * @brief AudioRam is an interface for the Audio RAM used by the SPC700.
@@ -336,8 +333,7 @@ class Spc700 {
// CBNE DBNZ // CBNE DBNZ
}; };
} // namespace audio
} // namespace emu } // namespace emu
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_EMU_SPC700_H #endif // YAZE_APP_EMU_SPC700_H