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

Play audio in emulator class, update class references from the SNES

Browse Source
This commit is contained in:
scawful
2024-04-24 10:08:05 -04:00
parent f3cf9ac555
commit bd6fc2e8f1
4 changed files with 34 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/emu/snes.h
View File

@@ -67,9 +67,9 @@ class SNES {
void SetPixels(uint8_t* pixel_data);
bool running() const { return running_; }
auto cpu() -> Cpu* { return &cpu_; }
auto ppu() -> video::Ppu* { return &ppu_; }
auto Memory() -> memory::MemoryImpl* { return &memory_; }
auto cpu() -> Cpu& { return cpu_; }
auto ppu() -> video::Ppu& { return ppu_; }
auto Memory() -> memory::MemoryImpl& { return memory_; }
private:
// Components of the SNES
@@ -77,7 +77,6 @@ class SNES {
Debugger debugger;
memory::RomInfo rom_info_;
memory::MemoryImpl memory_;
audio::AudioRamImpl audio_ram_;
memory::CpuCallbacks cpu_callbacks_ = {
[&](uint32_t adr) { return CpuRead(adr); },
@@ -86,7 +85,7 @@ class SNES {
};
Cpu cpu_{memory_, clock_, cpu_callbacks_};
video::Ppu ppu_{memory_, clock_};
audio::Apu apu_{memory_, audio_ram_, clock_};
audio::Apu apu_{memory_, clock_};
// Currently loaded ROM
std::vector<uint8_t> rom_data;