piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions 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/Volume.h"
namespace DVDThread
namespace DVD
{
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;
}
namespace DVD
{
enum class ReplyType : u32;
}
namespace DiscIO
{
enum class Platform;
@ -51,8 +46,10 @@ class TMDReader;
class TicketReader;
} // namespace IOS::ES
namespace DVDThread
namespace DVD
{
enum class ReplyType : u32;
class DVDThreadManager
{
public:
@ -148,4 +145,4 @@ private:
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;
DSP::DSPManager m_dsp;
DVD::DVDInterface m_dvd_interface;
DVDThread::DVDThreadManager m_dvd_thread;
DVD::DVDThreadManager m_dvd_thread;
ExpansionInterface::ExpansionInterfaceState m_expansion_interface_state;
Fifo::FifoManager m_fifo;
GeometryShaderManager m_geometry_shader_manager;
@ -143,7 +143,7 @@ DVD::DVDInterface& System::GetDVDInterface() const
return m_impl->m_dvd_interface;
}
DVDThread::DVDThreadManager& System::GetDVDThread() const
DVD::DVDThreadManager& System::GetDVDThread() const
{
return m_impl->m_dvd_thread;
}

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

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