preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-15 02:30:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

CDVD: simplify code

Browse Source
This commit is contained in:
Haruka authored and lightningterror committed 2023-02-09 09:52:00 +01:00
1 parent ec8712cceb
commit 616da8c99d
1 file changed
+3 -7
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2/CDVD/Darwin/DriveUtility.cpp
+3 -7
View File
@@ -41,8 +41,7 @@ std::vector<std::string> GetDriveListFromClasses(CFMutableDictionaryRef classes)
result = IOServiceGetMatchingServices(kIOMasterPortDefault, classes, &iterator);
if (result != KERN_SUCCESS)
return drives;
io_object_t media = IOIteratorNext(iterator);
while (media)
while (io_object_t media = IOIteratorNext(iterator))
{
CFTypeRef path_cfstr = IORegistryEntryCreateCFProperty(media, CFSTR(kIOBSDNameKey), kCFAllocatorDefault, 0);
if (path_cfstr)
@@ -58,7 +57,6 @@ std::vector<std::string> GetDriveListFromClasses(CFMutableDictionaryRef classes)
CFRelease(path_cfstr);
}
IOObjectRelease(media);
media = IOIteratorNext(iterator);
}
IOObjectRelease(iterator);
return drives;
@@ -71,15 +69,13 @@ std::vector<std::string> GetOpticalDriveList()
#ifdef __APPLE__
std::vector<std::string> drives;
CFMutableDictionaryRef cd_classes = IOServiceMatching(kIOCDMediaClass);
if (cd_classes)
if (CFMutableDictionaryRef cd_classes = IOServiceMatching(kIOCDMediaClass))
{
std::vector<std::string> cd = GetDriveListFromClasses(cd_classes);
drives.insert(drives.end(), cd.begin(), cd.end());
}
CFMutableDictionaryRef dvd_classes = IOServiceMatching(kIODVDMediaClass);
if (dvd_classes)
if (CFMutableDictionaryRef dvd_classes = IOServiceMatching(kIODVDMediaClass))
{
std::vector<std::string> dvd = GetDriveListFromClasses(dvd_classes);
drives.insert(drives.end(), dvd.begin(), dvd.end());