diff --git a/Source/Core/Core/HW/DVD/DVDThread.cpp b/Source/Core/Core/HW/DVD/DVDThread.cpp index 71b00a3709..ac2c4e5879 100644 --- a/Source/Core/Core/HW/DVD/DVDThread.cpp +++ b/Source/Core/Core/HW/DVD/DVDThread.cpp @@ -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 diff --git a/Source/Core/Core/HW/DVD/DVDThread.h b/Source/Core/Core/HW/DVD/DVDThread.h index a8d59f6a53..c3cd1d0af7 100644 --- a/Source/Core/Core/HW/DVD/DVDThread.h +++ b/Source/Core/Core/HW/DVD/DVDThread.h @@ -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 diff --git a/Source/Core/Core/System.cpp b/Source/Core/Core/System.cpp index b3a8902a31..9ca733031e 100644 --- a/Source/Core/Core/System.cpp +++ b/Source/Core/Core/System.cpp @@ -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; } diff --git a/Source/Core/Core/System.h b/Source/Core/Core/System.h index cf850ac73d..3ddb86ae2d 100644 --- a/Source/Core/Core/System.h +++ b/Source/Core/Core/System.h @@ -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;