From 3b632f5990c0f18fbcb2edcbca3ab7035e069ce4 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 30 Jan 2016 18:57:20 +0100 Subject: [PATCH] DVDInterface: Remove SetDiscInside It's only a call to SetLidOpen now. --- Source/Core/Core/HW/DVDInterface.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index 797db5de3d..95835b722f 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -263,7 +263,6 @@ static void EjectDiscCallback(u64 userdata, s64 cyclesLate); static void InsertDiscCallback(u64 userdata, s64 cyclesLate); static void FinishExecutingCommandCallback(u64 userdata, s64 cycles_late); -void SetDiscInside(bool disc_inside); void SetLidOpen(); void UpdateInterrupts(); @@ -486,7 +485,7 @@ bool SetVolumeName(const std::string& disc_path) { DVDThread::WaitUntilIdle(); s_inserted_volume = DiscIO::CreateVolumeFromFilename(disc_path); - SetDiscInside(VolumeIsValid()); + SetLidOpen(); return VolumeIsValid(); } @@ -496,7 +495,7 @@ bool SetVolumeDirectory(const std::string& full_path, bool is_wii, DVDThread::WaitUntilIdle(); s_inserted_volume = DiscIO::CreateVolumeFromDirectory(full_path, is_wii, apploader_path, DOL_path); - SetDiscInside(VolumeIsValid()); + SetLidOpen(); return VolumeIsValid(); } @@ -505,11 +504,6 @@ bool VolumeIsValid() return s_inserted_volume != nullptr; } -void SetDiscInside(bool disc_inside) -{ - SetLidOpen(); -} - bool IsDiscInside() { return s_inserted_volume != nullptr; @@ -523,7 +517,7 @@ static void EjectDiscCallback(u64 userdata, s64 cyclesLate) { DVDThread::WaitUntilIdle(); s_inserted_volume.reset(); - SetDiscInside(false); + SetLidOpen(); } static void InsertDiscCallback(u64 userdata, s64 cyclesLate)