The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-11 06:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

DVDInterface: Remove SetDiscInside

Browse Source 
It's only a call to SetLidOpen now.
This commit is contained in:
JosJuice 2016-01-30 18:57:20 +01:00
parent 167d16ded6
commit 3b632f5990
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -263,7 +263,6 @@ static void EjectDiscCallback(u64 userdata, s64 cyclesLate);
static void InsertDiscCallback(u64 userdata, s64 cyclesLate); static void InsertDiscCallback(u64 userdata, s64 cyclesLate);
static void FinishExecutingCommandCallback(u64 userdata, s64 cycles_late); static void FinishExecutingCommandCallback(u64 userdata, s64 cycles_late);
void SetDiscInside(bool disc_inside);
void SetLidOpen(); void SetLidOpen();
void UpdateInterrupts(); void UpdateInterrupts();
@ -486,7 +485,7 @@ bool SetVolumeName(const std::string& disc_path)
{ {
DVDThread::WaitUntilIdle(); DVDThread::WaitUntilIdle();
s_inserted_volume = DiscIO::CreateVolumeFromFilename(disc_path); s_inserted_volume = DiscIO::CreateVolumeFromFilename(disc_path);
SetDiscInside(VolumeIsValid()); SetLidOpen();
return VolumeIsValid(); return VolumeIsValid();
} }
@ -496,7 +495,7 @@ bool SetVolumeDirectory(const std::string& full_path, bool is_wii,
DVDThread::WaitUntilIdle(); DVDThread::WaitUntilIdle();
s_inserted_volume = s_inserted_volume =
DiscIO::CreateVolumeFromDirectory(full_path, is_wii, apploader_path, DOL_path); DiscIO::CreateVolumeFromDirectory(full_path, is_wii, apploader_path, DOL_path);
SetDiscInside(VolumeIsValid()); SetLidOpen();
return VolumeIsValid(); return VolumeIsValid();
} }
@ -505,11 +504,6 @@ bool VolumeIsValid()
return s_inserted_volume != nullptr; return s_inserted_volume != nullptr;
} }
void SetDiscInside(bool disc_inside)
{
SetLidOpen();
}
bool IsDiscInside() bool IsDiscInside()
{ {
return s_inserted_volume != nullptr; return s_inserted_volume != nullptr;
@ -523,7 +517,7 @@ static void EjectDiscCallback(u64 userdata, s64 cyclesLate)
{ {
DVDThread::WaitUntilIdle(); DVDThread::WaitUntilIdle();
s_inserted_volume.reset(); s_inserted_volume.reset();
SetDiscInside(false); SetLidOpen();
} }
static void InsertDiscCallback(u64 userdata, s64 cyclesLate) static void InsertDiscCallback(u64 userdata, s64 cyclesLate)