common: Fix last warning in SystemInfo (#1757)
* common: Fix last warning in SystemInfo * info to Info * fix MacOSSystemInfo file name by delete the file * MacOSSysteminfo to MacOSSystemInfo
This commit is contained in:
parent
a04a1b663d
commit
5e6dc37aed
4 changed files with 15 additions and 26 deletions
|
@ -1,4 +1,5 @@
|
|||
using System.Runtime.InteropServices;
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Ryujinx.Common.SystemInfo
|
||||
{
|
||||
|
@ -7,35 +8,23 @@ namespace Ryujinx.Common.SystemInfo
|
|||
public virtual string OsDescription => $"{RuntimeInformation.OSDescription} ({RuntimeInformation.OSArchitecture})";
|
||||
public virtual string CpuName => "Unknown";
|
||||
public virtual ulong RamSize => 0;
|
||||
|
||||
public string RamSizeInMB
|
||||
{
|
||||
get
|
||||
{
|
||||
if (RamSize == 0)
|
||||
{
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
return $"{RamSize / 1024 / 1024} MB";
|
||||
}
|
||||
}
|
||||
public string RamSizeInMB => (RamSize == 0) ? "Unknown" : $"{RamSize / 1024 / 1024} MB";
|
||||
|
||||
public static SystemInfo Instance { get; }
|
||||
|
||||
static SystemInfo()
|
||||
{
|
||||
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||
if (OperatingSystem.IsWindows())
|
||||
{
|
||||
Instance = new WindowsSysteminfo();
|
||||
Instance = new WindowsSystemInfo();
|
||||
}
|
||||
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||
else if (OperatingSystem.IsLinux())
|
||||
{
|
||||
Instance = new LinuxSysteminfo();
|
||||
Instance = new LinuxSystemInfo();
|
||||
}
|
||||
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
|
||||
else if (OperatingSystem.IsMacOS())
|
||||
{
|
||||
Instance = new MacOSSysteminfo();
|
||||
Instance = new MacOSSystemInfo();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue