forked from MeloNX/MeloNX
android - fix rebase
This commit is contained in:
parent
5fa2f30ac6
commit
896851e909
@ -663,13 +663,13 @@ namespace LibRyujinx
|
|||||||
{
|
{
|
||||||
if (SwitchDevice is { } switchDevice)
|
if (SwitchDevice is { } switchDevice)
|
||||||
{
|
{
|
||||||
switchDevice.HostUiHandler = new AndroidUiHandler();
|
switchDevice.HostUiHandler = new AndroidUIHandler();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void WaitUiHandler()
|
public static void WaitUiHandler()
|
||||||
{
|
{
|
||||||
if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
|
if (SwitchDevice?.HostUiHandler is AndroidUIHandler uiHandler)
|
||||||
{
|
{
|
||||||
uiHandler.Wait();
|
uiHandler.Wait();
|
||||||
}
|
}
|
||||||
@ -677,7 +677,7 @@ namespace LibRyujinx
|
|||||||
|
|
||||||
public static void StopUiHandlerWait()
|
public static void StopUiHandlerWait()
|
||||||
{
|
{
|
||||||
if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
|
if (SwitchDevice?.HostUiHandler is AndroidUIHandler uiHandler)
|
||||||
{
|
{
|
||||||
uiHandler.Set();
|
uiHandler.Set();
|
||||||
}
|
}
|
||||||
@ -685,7 +685,7 @@ namespace LibRyujinx
|
|||||||
|
|
||||||
public static void SetUiHandlerResponse(bool isOkPressed, long input)
|
public static void SetUiHandlerResponse(bool isOkPressed, long input)
|
||||||
{
|
{
|
||||||
if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
|
if (SwitchDevice?.HostUiHandler is AndroidUIHandler uiHandler)
|
||||||
{
|
{
|
||||||
uiHandler.SetResponse(isOkPressed, input);
|
uiHandler.SetResponse(isOkPressed, input);
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,6 @@ namespace LibRyujinx
|
|||||||
{
|
{
|
||||||
var xPtr = Marshal.StringToHGlobalAnsi(x);
|
var xPtr = Marshal.StringToHGlobalAnsi(x);
|
||||||
byte* xp = (byte*)xPtr;
|
byte* xp = (byte*)xPtr;
|
||||||
LibRyujinx.debug_break(0);
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
nint ptr = default;
|
nint ptr = default;
|
||||||
|
@ -28,6 +28,6 @@ namespace Ryujinx.Common
|
|||||||
|
|
||||||
public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannelOwner);
|
public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannelOwner);
|
||||||
|
|
||||||
public static string Version => SystemInfo.SystemInfo.IsBionic ? "Android_1.0" : OperatingSystem.IsIOS() ? "iOS" : IsValid ? BuildVersion : !RuntimeFeature.IsDynamicCodeCompiled ? "libryujinx" : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
|
public static string Version => PlatformInfo.IsBionic ? "Android_1.0" : OperatingSystem.IsIOS() ? "iOS" : IsValid ? BuildVersion : !RuntimeFeature.IsDynamicCodeCompiled ? "libryujinx" : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
using Ryujinx.Cpu.Jit;
|
|
||||||
using Ryujinx.Cpu.Signal;
|
using Ryujinx.Cpu.Signal;
|
||||||
using Ryujinx.Common;
|
using Ryujinx.Common;
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
|
@ -171,4 +171,4 @@ namespace Ryujinx.Cpu.Nce
|
|||||||
_context.Dispose();
|
_context.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user