From eb25c46a91cc0adbbf0f559422d2e6357f7cf979 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Thu, 9 Mar 2023 21:43:03 +0100 Subject: HW/DVDInterface: Refactor to class. --- Source/Core/DolphinQt/MainWindow.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinQt/MainWindow.cpp') diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 59fc19f6a3..604400f1c3 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -746,12 +746,15 @@ void MainWindow::ChangeDisc() std::vector paths = StringListToStdVector(PromptFileNames()); if (!paths.empty()) - Core::RunAsCPUThread([&paths] { DVDInterface::ChangeDisc(paths); }); + Core::RunAsCPUThread( + [&paths] { Core::System::GetInstance().GetDVDInterface().ChangeDisc(paths); }); } void MainWindow::EjectDisc() { - Core::RunAsCPUThread([] { DVDInterface::EjectDisc(DVDInterface::EjectCause::User); }); + Core::RunAsCPUThread([] { + Core::System::GetInstance().GetDVDInterface().EjectDisc(DVDInterface::EjectCause::User); + }); } void MainWindow::OpenUserFolder() -- cgit v1.2.3 From ee35103ed9ae9e7ac1447232eaccda031835222f Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Fri, 10 Mar 2023 18:33:09 +0100 Subject: HW/DVD: Rename DVDInterface namespace to DVD. --- Source/Core/DolphinQt/MainWindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinQt/MainWindow.cpp') diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 604400f1c3..ac34999c4d 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -752,9 +752,8 @@ void MainWindow::ChangeDisc() void MainWindow::EjectDisc() { - Core::RunAsCPUThread([] { - Core::System::GetInstance().GetDVDInterface().EjectDisc(DVDInterface::EjectCause::User); - }); + Core::RunAsCPUThread( + [] { Core::System::GetInstance().GetDVDInterface().EjectDisc(DVD::EjectCause::User); }); } void MainWindow::OpenUserFolder() -- cgit v1.2.3