ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HW: Move DVDInterface variables to Core::System.

This commit is contained in:
Admiral H. Curtiss 2022-09-02 23:03:40 +02:00
parent c4d5804f60
commit 2d45ce5c4e
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
4 changed files with 392 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

670
Source/Core/Core/HW/DVD/DVDInterface.cpp
View File

File diff suppressed because it is too large Load Diff

17
Source/Core/Core/HW/DVD/DVDInterface.h
View File

@ -23,6 +23,23 @@ class Mapping;
namespace DVDInterface
{
class DVDInterfaceState
{
public:
DVDInterfaceState();
DVDInterfaceState(const DVDInterfaceState&) = delete;
DVDInterfaceState(DVDInterfaceState&&) = delete;
DVDInterfaceState& operator=(const DVDInterfaceState&) = delete;
DVDInterfaceState& operator=(DVDInterfaceState&&) = delete;
~DVDInterfaceState();
struct Data;
Data& GetData() { return *m_data; }
private:
std::unique_ptr<Data> m_data;
};
enum class DICommand : u8
{
Inquiry = 0x12,

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

@ -7,6 +7,7 @@
#include "AudioCommon/SoundStream.h"
#include "Core/Config/MainSettings.h"
#include "Core/HW/DVD/DVDInterface.h"
#include "Core/HW/DVD/DVDThread.h"
namespace Core
@ -17,6 +18,7 @@ struct System::Impl
bool m_sound_stream_running = false;
bool m_audio_dump_started = false;
DVDInterface::DVDInterfaceState m_dvd_interface_state;
DVDThread::DVDThreadState m_dvd_thread_state;
};
@ -62,6 +64,11 @@ void System::SetAudioDumpStarted(bool started)
m_impl->m_audio_dump_started = started;
}
DVDInterface::DVDInterfaceState& System::GetDVDInterfaceState() const
{
return m_impl->m_dvd_interface_state;
}
DVDThread::DVDThreadState& System::GetDVDThreadState() const
{
return m_impl->m_dvd_thread_state;

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

@ -7,6 +7,10 @@
class SoundStream;
namespace DVDInterface
{
class DVDInterfaceState;
}
namespace DVDThread
{
class DVDThreadState;
@ -45,6 +49,7 @@ public:
bool IsAudioDumpStarted() const;
void SetAudioDumpStarted(bool started);
DVDInterface::DVDInterfaceState& GetDVDInterfaceState() const;
DVDThread::DVDThreadState& GetDVDThreadState() const;
private: