mirror of
https://git.743378673.xyz/MeloNX/MeloNX.git
synced 2025-06-30 12:26:25 +02:00
Merge Latest Ryujinx (Unstable)
This commit is contained in:
parent
aaefc0a9e5
commit
12ab8bc3e2
1237 changed files with 48656 additions and 21399 deletions
|
@ -8,7 +8,7 @@ using Ryujinx.HLE.HOS;
|
|||
using Ryujinx.HLE.HOS.Services.Apm;
|
||||
using Ryujinx.HLE.HOS.Services.Hid;
|
||||
using Ryujinx.HLE.Loaders.Processes;
|
||||
using Ryujinx.HLE.Ui;
|
||||
using Ryujinx.HLE.UI;
|
||||
using Ryujinx.Memory;
|
||||
using System;
|
||||
|
||||
|
@ -26,7 +26,7 @@ namespace Ryujinx.HLE
|
|||
public PerformanceStatistics Statistics { get; }
|
||||
public Hid Hid { get; }
|
||||
public TamperMachine TamperMachine { get; }
|
||||
public IHostUiHandler UiHandler { get; }
|
||||
public IHostUIHandler UIHandler { get; }
|
||||
|
||||
public bool EnableDeviceVsync { get; set; } = true;
|
||||
|
||||
|
@ -40,7 +40,7 @@ namespace Ryujinx.HLE
|
|||
|
||||
Configuration = configuration;
|
||||
FileSystem = Configuration.VirtualFileSystem;
|
||||
UiHandler = Configuration.HostUiHandler;
|
||||
UIHandler = Configuration.HostUIHandler;
|
||||
|
||||
MemoryAllocationFlags memoryAllocationFlags = configuration.MemoryManagerMode == MemoryManagerMode.SoftwarePageTable
|
||||
? MemoryAllocationFlags.Reserve
|
||||
|
@ -56,6 +56,7 @@ namespace Ryujinx.HLE
|
|||
Processes = new ProcessLoader(this);
|
||||
TamperMachine = new TamperMachine();
|
||||
|
||||
System.InitializeServices();
|
||||
System.State.SetLanguage(Configuration.SystemLanguage);
|
||||
System.State.SetRegion(Configuration.Region);
|
||||
|
||||
|
@ -86,9 +87,9 @@ namespace Ryujinx.HLE
|
|||
return Processes.LoadUnpackedNca(exeFsDir, romFsFile);
|
||||
}
|
||||
|
||||
public bool LoadXci(string xciFile)
|
||||
public bool LoadXci(string xciFile, ulong applicationId = 0)
|
||||
{
|
||||
return Processes.LoadXci(xciFile);
|
||||
return Processes.LoadXci(xciFile, applicationId);
|
||||
}
|
||||
|
||||
public bool LoadNca(string ncaFile)
|
||||
|
@ -96,9 +97,9 @@ namespace Ryujinx.HLE
|
|||
return Processes.LoadNca(ncaFile);
|
||||
}
|
||||
|
||||
public bool LoadNsp(string nspFile)
|
||||
public bool LoadNsp(string nspFile, ulong applicationId = 0)
|
||||
{
|
||||
return Processes.LoadNsp(nspFile);
|
||||
return Processes.LoadNsp(nspFile, applicationId);
|
||||
}
|
||||
|
||||
public bool LoadProgram(string fileName)
|
||||
|
@ -130,12 +131,12 @@ namespace Ryujinx.HLE
|
|||
|
||||
public void SetVolume(float volume)
|
||||
{
|
||||
System.SetVolume(Math.Clamp(volume, 0, 1));
|
||||
AudioDeviceDriver.Volume = Math.Clamp(volume, 0f, 1f);
|
||||
}
|
||||
|
||||
public float GetVolume()
|
||||
{
|
||||
return System.GetVolume();
|
||||
return AudioDeviceDriver.Volume;
|
||||
}
|
||||
|
||||
public void EnableCheats()
|
||||
|
@ -145,7 +146,7 @@ namespace Ryujinx.HLE
|
|||
|
||||
public bool IsAudioMuted()
|
||||
{
|
||||
return System.GetVolume() == 0;
|
||||
return AudioDeviceDriver.Volume == 0;
|
||||
}
|
||||
|
||||
public void DisposeGpu()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue