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

Qt: Implement remove disc

This commit is contained in:
Connor McLaughlin 2022-06-29 00:00:51 +10:00 committed by refractionpcsx2
parent 5391b529b6
commit 131b92e9fe
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2-qt/MainWindow.cpp
View File

@ -207,6 +207,7 @@ void MainWindow::connectSignals()
connect(m_ui.actionChangeDiscFromFile, &QAction::triggered, this, &MainWindow::onChangeDiscFromFileActionTriggered); connect(m_ui.actionChangeDiscFromFile, &QAction::triggered, this, &MainWindow::onChangeDiscFromFileActionTriggered);
connect(m_ui.actionChangeDiscFromDevice, &QAction::triggered, this, &MainWindow::onChangeDiscFromDeviceActionTriggered); connect(m_ui.actionChangeDiscFromDevice, &QAction::triggered, this, &MainWindow::onChangeDiscFromDeviceActionTriggered);
connect(m_ui.actionChangeDiscFromGameList, &QAction::triggered, this, &MainWindow::onChangeDiscFromGameListActionTriggered); connect(m_ui.actionChangeDiscFromGameList, &QAction::triggered, this, &MainWindow::onChangeDiscFromGameListActionTriggered);
connect(m_ui.actionRemoveDisc, &QAction::triggered, this, &MainWindow::onRemoveDiscActionTriggered);
connect(m_ui.menuChangeDisc, &QMenu::aboutToShow, this, &MainWindow::onChangeDiscMenuAboutToShow); connect(m_ui.menuChangeDisc, &QMenu::aboutToShow, this, &MainWindow::onChangeDiscMenuAboutToShow);
connect(m_ui.menuChangeDisc, &QMenu::aboutToHide, this, &MainWindow::onChangeDiscMenuAboutToHide); connect(m_ui.menuChangeDisc, &QMenu::aboutToHide, this, &MainWindow::onChangeDiscMenuAboutToHide);
connect(m_ui.actionPowerOff, &QAction::triggered, this, [this]() { requestShutdown(true, true); }); connect(m_ui.actionPowerOff, &QAction::triggered, this, [this]() { requestShutdown(true, true); });
@ -1141,6 +1142,11 @@ void MainWindow::onChangeDiscFromDeviceActionTriggered()
g_emu_thread->changeDisc(CDVD_SourceType::Disc, path); g_emu_thread->changeDisc(CDVD_SourceType::Disc, path);
} }
void MainWindow::onRemoveDiscActionTriggered()
{
g_emu_thread->changeDisc(CDVD_SourceType::NoDisc, QString());
}
void MainWindow::onChangeDiscMenuAboutToShow() void MainWindow::onChangeDiscMenuAboutToShow()
{ {
// TODO: This is where we would populate the playlist if there is one. // TODO: This is where we would populate the playlist if there is one.

1
pcsx2-qt/MainWindow.h
View File

@ -118,6 +118,7 @@ private Q_SLOTS:
void onChangeDiscFromFileActionTriggered(); void onChangeDiscFromFileActionTriggered();
void onChangeDiscFromGameListActionTriggered(); void onChangeDiscFromGameListActionTriggered();
void onChangeDiscFromDeviceActionTriggered(); void onChangeDiscFromDeviceActionTriggered();
void onRemoveDiscActionTriggered();
void onChangeDiscMenuAboutToShow(); void onChangeDiscMenuAboutToShow();
void onChangeDiscMenuAboutToHide(); void onChangeDiscMenuAboutToHide();
void onLoadStateMenuAboutToShow(); void onLoadStateMenuAboutToShow();

9
pcsx2/VMManager.cpp
View File

@ -1307,17 +1307,20 @@ bool VMManager::ChangeDisc(CDVD_SourceType source, std::string path)
const bool result = DoCDVDopen(); const bool result = DoCDVDopen();
if (result) if (result)
{ {
Host::AddOSDMessage(fmt::format("Disc changed to '{}'.", display_name), 5.0f); if (source == CDVD_SourceType::NoDisc)
Host::AddKeyedOSDMessage("ChangeDisc", "Disc removed.", 5.0f);
else
Host::AddKeyedOSDMessage("ChangeDisc", fmt::format("Disc changed to '{}'.", display_name), 5.0f);
} }
else else
{ {
Host::AddOSDMessage(fmt::format("Failed to open new disc image '{}'. Reverting to old image.", display_name), 20.0f); Host::AddKeyedOSDMessage("ChangeDisc", fmt::format("Failed to open new disc image '{}'. Reverting to old image.", display_name), 20.0f);
CDVDsys_ChangeSource(old_type); CDVDsys_ChangeSource(old_type);
if (!old_path.empty()) if (!old_path.empty())
CDVDsys_SetFile(old_type, std::move(old_path)); CDVDsys_SetFile(old_type, std::move(old_path));
if (!DoCDVDopen()) if (!DoCDVDopen())
{ {
Host::AddOSDMessage("Failed to switch back to old disc image. Removing disc.", 20.0f); Host::AddKeyedOSDMessage("ChangeDisc", "Failed to switch back to old disc image. Removing disc.", 20.0f);
CDVDsys_ChangeSource(CDVD_SourceType::NoDisc); CDVDsys_ChangeSource(CDVD_SourceType::NoDisc);
DoCDVDopen(); DoCDVDopen();
} }