piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6072 from JosJuice/eject-disc

Browse Source 
Add an option to eject the disc
This commit is contained in:
Leo Lam
2017-09-18 12:47:47 +02:00
committed by GitHub
parent 1566f3ae7e e4faabb763
commit c9f790dca4
12 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/AudioInterface.h"
#include "Core/HW/DVD/DVDMath.h"
@ -451,10 +450,6 @@ bool IsDiscInside()
return DVDThread::HasDisc();
}
// Take care of all logic of "swapping discs"
// We want this in the "backend", NOT the gui
// any !empty string will be deleted to ensure
// that the userdata string exists when called
static void EjectDiscCallback(u64 userdata, s64 cyclesLate)
{
SetDisc(nullptr);
@ -473,14 +468,14 @@ static void InsertDiscCallback(u64 userdata, s64 cyclesLate)
s_disc_path_to_insert.clear();
}
// Can only be called by the host thread
void ChangeDiscAsHost(const std::string& new_path)
// Must only be called on the CPU thread
void EjectDisc()
{
Core::RunAsCPUThread([&] { ChangeDiscAsCPU(new_path); });
CoreTiming::ScheduleEvent(0, s_eject_disc);
}
// Can only be called by the CPU thread
void ChangeDiscAsCPU(const std::string& new_path)
// Must only be called on the CPU thread
void ChangeDisc(const std::string& new_path)
{
if (!s_disc_path_to_insert.empty())
{
@ -488,10 +483,10 @@ void ChangeDiscAsCPU(const std::string& new_path)
return;
}
s_disc_path_to_insert = new_path;
CoreTiming::ScheduleEvent(0, s_eject_disc);
CoreTiming::ScheduleEvent(SystemTimers::GetTicksPerSecond(), s_insert_disc);
EjectDisc();
s_disc_path_to_insert = new_path;
CoreTiming::ScheduleEvent(SystemTimers::GetTicksPerSecond(), s_insert_disc);
Movie::SignalDiscChange(new_path);
}

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

@ -113,8 +113,8 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
void SetDisc(std::unique_ptr<DiscIO::Volume> disc);
bool IsDiscInside();
void ChangeDiscAsHost(const std::string& new_path); // Can only be called by the host thread
void ChangeDiscAsCPU(const std::string& new_path); // Can only be called by the CPU thread
void EjectDisc(); // Must only be called on the CPU thread
void ChangeDisc(const std::string& new_path); // Must only be called on the CPU thread
// This function returns true and calls SConfig::SetRunningGameMetadata(Volume&, Partition&)
// if both of the following conditions are true:

1
Source/Core/Core/HotkeyManager.cpp
View File

@ -23,6 +23,7 @@
const std::string hotkey_labels[] = {
_trans("Open"),
_trans("Change Disc"),
_trans("Eject Disc"),
_trans("Refresh List"),
_trans("Toggle Pause"),
_trans("Stop"),

1
Source/Core/Core/HotkeyManager.h
View File

@ -21,6 +21,7 @@ enum Hotkey
{
HK_OPEN,
HK_CHANGE_DISC,
HK_EJECT_DISC,
HK_REFRESH_LIST,
HK_PLAY_PAUSE,
HK_STOP,

2
Source/Core/Core/Movie.cpp
View File

@ -1180,7 +1180,7 @@ void PlayController(GCPadStatus* PadStatus, int controllerID)
}
if (found)
{
DVDInterface::ChangeDiscAsCPU(path);
Core::RunAsCPUThread([&path] { DVDInterface::ChangeDisc(path); });
}
else
{