mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-25 23:29:55 -06:00
Refactor NDS
and DSi
to be objects (#1893)
* First crack at refactoring NDS and DSi into objects - Remove all global/`static` variables in `NDS` and related classes - Rely more on virtual dispatch when we need to pick methods at runtime - Pass `NDS&` or `DSi&` to its constituent components where necessary - Introduce some headers or move some definitions to break `#include` cycles * Refactor the frontend to accommodate the core's changes * Move up `SchedList`'s declaration - Move it to before the components are initialized so the `map`s inside are initialized - Fields in C++ are initialized in the order they're declared * Fix a crash when allocating memory * Fix JIT-free builds * Fix GDB-free builds * Fix Linux builds - Explicitly qualify some member types in NDS, since they share the same name as their classes * Remove an unnecessary template argument - This was causing the build to fail on macOS * Fix ARM and Android builds * Rename `Constants.h` to `MemConstants.h` * Add `NDS::IsRunning()` * Use an `#include` guard instead of `#pragma once`
This commit is contained in:

committed by
GitHub

parent
c84cb17462
commit
e973236203
12
src/SPU.h
12
src/SPU.h
@ -24,12 +24,13 @@
|
||||
|
||||
namespace melonDS
|
||||
{
|
||||
class NDS;
|
||||
class SPU;
|
||||
|
||||
class SPUChannel
|
||||
{
|
||||
public:
|
||||
SPUChannel(u32 num);
|
||||
SPUChannel(u32 num, melonDS::NDS& nds);
|
||||
~SPUChannel();
|
||||
void Reset();
|
||||
void DoSavestate(Savestate* file);
|
||||
@ -142,13 +143,13 @@ public:
|
||||
void PanOutput(s32 in, s32& left, s32& right);
|
||||
|
||||
private:
|
||||
u32 (*BusRead32)(u32 addr);
|
||||
melonDS::NDS& NDS;
|
||||
};
|
||||
|
||||
class SPUCaptureUnit
|
||||
{
|
||||
public:
|
||||
SPUCaptureUnit(u32 num);
|
||||
SPUCaptureUnit(u32 num, melonDS::NDS&);
|
||||
~SPUCaptureUnit();
|
||||
void Reset();
|
||||
void DoSavestate(Savestate* file);
|
||||
@ -199,13 +200,13 @@ public:
|
||||
void Run(s32 sample);
|
||||
|
||||
private:
|
||||
void (*BusWrite32)(u32 addr, u32 val);
|
||||
melonDS::NDS& NDS;
|
||||
};
|
||||
|
||||
class SPU
|
||||
{
|
||||
public:
|
||||
SPU();
|
||||
SPU(melonDS::NDS& nds);
|
||||
~SPU();
|
||||
void Reset();
|
||||
void DoSavestate(Savestate* file);
|
||||
@ -240,6 +241,7 @@ public:
|
||||
|
||||
private:
|
||||
static const u32 OutputBufferSize = 2*2048;
|
||||
melonDS::NDS& NDS;
|
||||
s16 OutputBackbuffer[2 * OutputBufferSize];
|
||||
u32 OutputBackbufferWritePosition;
|
||||
|
||||
|
Reference in New Issue
Block a user