FifoPlayer: Move instance to System.

This commit is contained in:
Admiral H. Curtiss 2024-01-05 09:31:59 +01:00
commit fc2ec826d4
No known key found for this signature in database
GPG key ID: F051B4C4044F33FB
13 changed files with 76 additions and 56 deletions

View file

@ -8,6 +8,7 @@
#include "AudioCommon/SoundStream.h"
#include "Core/Config/MainSettings.h"
#include "Core/CoreTiming.h"
#include "Core/FifoPlayer/FifoPlayer.h"
#include "Core/HW/AudioInterface.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
@ -48,7 +49,8 @@ struct System::Impl
m_memory(system), m_pixel_engine{system}, m_power_pc(system),
m_mmu(system, m_memory, m_power_pc), m_processor_interface(system),
m_serial_interface(system), m_system_timers(system), m_video_interface(system),
m_interpreter(system, m_power_pc.GetPPCState(), m_mmu), m_jit_interface(system)
m_interpreter(system, m_power_pc.GetPPCState(), m_mmu), m_jit_interface(system),
m_fifo_player(system)
{
}
@ -86,6 +88,7 @@ struct System::Impl
Interpreter m_interpreter;
JitInterface m_jit_interface;
VideoCommon::CustomAssetLoader m_custom_asset_loader;
FifoPlayer m_fifo_player;
};
System::System() : m_impl{std::make_unique<Impl>(*this)}
@ -176,6 +179,11 @@ Fifo::FifoManager& System::GetFifo() const
return m_impl->m_fifo;
}
FifoPlayer& System::GetFifoPlayer() const
{
return m_impl->m_fifo_player;
}
GeometryShaderManager& System::GetGeometryShaderManager() const
{
return m_impl->m_geometry_shader_manager;