The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-19 02:36:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

HW/DVD: Merge DVDThread namespace into DVD.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2023-03-10 18:59:12 +01:00
parent d26a540253
commit 25e883280a
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/DVD/DVDThread.cpp
View File

@ -34,7 +34,7 @@
#include "DiscIO/Enums.h" #include "DiscIO/Enums.h"
#include "DiscIO/Volume.h" #include "DiscIO/Volume.h"
namespace DVDThread namespace DVD
{ {
DVDThreadManager::DVDThreadManager(Core::System& system) : m_system(system) DVDThreadManager::DVDThreadManager(Core::System& system) : m_system(system)
{ {
@ -358,4 +358,4 @@ void DVDThreadManager::DVDThreadMain()
} }
} }
} }
} // namespace DVDThread } // namespace DVD

11
Source/Core/Core/HW/DVD/DVDThread.h
View File

@ -34,11 +34,6 @@ namespace DiscIO
struct Partition; struct Partition;
} }
namespace DVD
{
enum class ReplyType : u32;
}
namespace DiscIO namespace DiscIO
{ {
enum class Platform; enum class Platform;
@ -51,8 +46,10 @@ class TMDReader;
class TicketReader; class TicketReader;
} // namespace IOS::ES } // namespace IOS::ES
namespace DVDThread namespace DVD
{ {
enum class ReplyType : u32;
class DVDThreadManager class DVDThreadManager
{ {
public: public:
@ -148,4 +145,4 @@ private:
Core::System& m_system; Core::System& m_system;
}; };
} // namespace DVDThread } // namespace DVD

4
Source/Core/Core/System.cpp
View File

@ -51,7 +51,7 @@ struct System::Impl
CPU::CPUManager m_cpu; CPU::CPUManager m_cpu;
DSP::DSPManager m_dsp; DSP::DSPManager m_dsp;
DVD::DVDInterface m_dvd_interface; DVD::DVDInterface m_dvd_interface;
DVDThread::DVDThreadManager m_dvd_thread; DVD::DVDThreadManager m_dvd_thread;
ExpansionInterface::ExpansionInterfaceState m_expansion_interface_state; ExpansionInterface::ExpansionInterfaceState m_expansion_interface_state;
Fifo::FifoManager m_fifo; Fifo::FifoManager m_fifo;
GeometryShaderManager m_geometry_shader_manager; GeometryShaderManager m_geometry_shader_manager;
@ -143,7 +143,7 @@ DVD::DVDInterface& System::GetDVDInterface() const
return m_impl->m_dvd_interface; return m_impl->m_dvd_interface;
} }
DVDThread::DVDThreadManager& System::GetDVDThread() const DVD::DVDThreadManager& System::GetDVDThread() const
{ {
return m_impl->m_dvd_thread; return m_impl->m_dvd_thread;
} }

7
Source/Core/Core/System.h
View File

@ -34,11 +34,8 @@ class DSPManager;
namespace DVD namespace DVD
{ {
class DVDInterface; class DVDInterface;
}
namespace DVDThread
{
class DVDThreadManager; class DVDThreadManager;
} } // namespace DVD
namespace ExpansionInterface namespace ExpansionInterface
{ {
class ExpansionInterfaceState; class ExpansionInterfaceState;
@ -128,7 +125,7 @@ public:
CommandProcessor::CommandProcessorManager& GetCommandProcessor() const; CommandProcessor::CommandProcessorManager& GetCommandProcessor() const;
DSP::DSPManager& GetDSP() const; DSP::DSPManager& GetDSP() const;
DVD::DVDInterface& GetDVDInterface() const; DVD::DVDInterface& GetDVDInterface() const;
DVDThread::DVDThreadManager& GetDVDThread() const; DVD::DVDThreadManager& GetDVDThread() const;
ExpansionInterface::ExpansionInterfaceState& GetExpansionInterfaceState() const; ExpansionInterface::ExpansionInterfaceState& GetExpansionInterfaceState() const;
Fifo::FifoManager& GetFifo() const; Fifo::FifoManager& GetFifo() const;
GeometryShaderManager& GetGeometryShaderManager() const; GeometryShaderManager& GetGeometryShaderManager() const;