ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue with settings adapter (#2223) 

This would fail to work on any core that used the serviceprovider to provide a settings definition that wasn't on the iemulator itself?  Guess we never did that
This commit is contained in:
nattthebear 2020-07-11 13:35:09 -04:00 committed by GitHub
parent 9820fb0879
commit a28ca37cfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs
View File

@ -69,20 +69,18 @@ namespace BizHawk.Emulation.Common
/// </summary> /// </summary>
public class SettingsAdapter public class SettingsAdapter
{ {
public SettingsAdapter(IEmulator e) public SettingsAdapter(IEmulator emulator)
{ {
_emu = e; var settableType = emulator.ServiceProvider.AvailableServices
.SingleOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(ISettable<,>));
Type impl = e.GetType().GetInterfaces() if (settableType == null)
.FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(ISettable<,>));
if (impl == null)
{ {
HasSettings = false; HasSettings = false;
HasSyncSettings = false; HasSyncSettings = false;
} }
else else
{ {
var tt = impl.GetGenericArguments(); var tt = settableType.GetGenericArguments();
var settingType = tt[0]; var settingType = tt[0];
var syncType = tt[1]; var syncType = tt[1];
HasSettings = settingType != typeof(object); // object is used for a placeholder where an emu doesn't have both s and ss HasSettings = settingType != typeof(object); // object is used for a placeholder where an emu doesn't have both s and ss
@ -90,25 +88,27 @@ namespace BizHawk.Emulation.Common
if (HasSettings) if (HasSettings)
{ {
_gets = impl.GetMethod("GetSettings"); _gets = settableType.GetMethod("GetSettings");
_puts = impl.GetMethod("PutSettings"); _puts = settableType.GetMethod("PutSettings");
} }
if (HasSyncSettings) if (HasSyncSettings)
{ {
_getss = impl.GetMethod("GetSyncSettings"); _getss = settableType.GetMethod("GetSyncSettings");
_putss = impl.GetMethod("PutSyncSettings"); _putss = settableType.GetMethod("PutSyncSettings");
} }
_settable = emulator.ServiceProvider.GetService(settableType);
} }
} }
private readonly IEmulator _emu; private readonly object _settable;
public bool HasSettings { get; } public bool HasSettings { get; }
public bool HasSyncSettings { get; } public bool HasSyncSettings { get; }
private readonly object[] _tmp1 = new object[1]; private readonly object[] _tempObject = new object[1];
private readonly object[] _tmp0 = new object[0]; private static readonly object[] Empty = new object[0];
private readonly MethodInfo _gets; private readonly MethodInfo _gets;
private readonly MethodInfo _puts; private readonly MethodInfo _puts;
@ -123,7 +123,7 @@ namespace BizHawk.Emulation.Common
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
return _gets.Invoke(_emu, _tmp0); return _gets.Invoke(_settable, Empty);
} }
/// <exception cref="InvalidOperationException">does not have sync settings</exception> /// <exception cref="InvalidOperationException">does not have sync settings</exception>
@ -134,7 +134,7 @@ namespace BizHawk.Emulation.Common
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
return _getss.Invoke(_emu, _tmp0); return _getss.Invoke(_settable, Empty);
} }
/// <exception cref="InvalidOperationException">does not have non-sync settings</exception> /// <exception cref="InvalidOperationException">does not have non-sync settings</exception>
@ -145,8 +145,8 @@ namespace BizHawk.Emulation.Common
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
_tmp1[0] = o; _tempObject[0] = o;
return (PutSettingsDirtyBits)_puts.Invoke(_emu, _tmp1); return (PutSettingsDirtyBits)_puts.Invoke(_settable, _tempObject);
} }
/// <exception cref="InvalidOperationException">does not have sync settings</exception> /// <exception cref="InvalidOperationException">does not have sync settings</exception>
@ -157,8 +157,8 @@ namespace BizHawk.Emulation.Common
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
_tmp1[0] = o; _tempObject[0] = o;
return (PutSettingsDirtyBits)_putss.Invoke(_emu, _tmp1); return (PutSettingsDirtyBits)_putss.Invoke(_settable, _tempObject);
} }
} }
} }