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

slight cleanup

This commit is contained in:
adelikat 2019-12-22 09:59:54 -06:00
parent c162b2774d
commit f8ed9f49eb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.EmuHawk/Api/ApiManager.cs
View File

@ -1,10 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using BizHawk.Common.ReflectionExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Client.ApiHawk; using BizHawk.Client.ApiHawk;
using BizHawk.Client.Common; using BizHawk.Client.Common;
@ -14,7 +12,7 @@ namespace BizHawk.Client.EmuHawk
{ {
public static class ApiManager public static class ApiManager
{ {
private static ApiContainer container; private static ApiContainer _container;
private static IExternalApiProvider Register(IEmulatorServiceProvider serviceProvider) private static IExternalApiProvider Register(IEmulatorServiceProvider serviceProvider)
{ {
foreach (var api in Assembly.Load("BizHawk.Client.Common").GetTypes() foreach (var api in Assembly.Load("BizHawk.Client.Common").GetTypes()
@ -26,8 +24,8 @@ namespace BizHawk.Client.EmuHawk
ServiceInjector.UpdateServices(serviceProvider, instance); ServiceInjector.UpdateServices(serviceProvider, instance);
Libraries.Add(api, instance); Libraries.Add(api, instance);
} }
container = new ApiContainer(Libraries); _container = new ApiContainer(Libraries);
return new BasicApiProvider(container); return new BasicApiProvider(_container);
} }
private static readonly Dictionary<Type, IExternalApi> Libraries = new Dictionary<Type, IExternalApi>(); private static readonly Dictionary<Type, IExternalApi> Libraries = new Dictionary<Type, IExternalApi>();

2
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -750,7 +750,7 @@ namespace BizHawk.Client.EmuHawk
private void DisengageTastudio() private void DisengageTastudio()
{ {
Mainform.PauseOnFrame = null; Mainform.PauseOnFrame = null;
GlobalWin.OSD.AddMessage("TAStudio disengaged"); Mainform.AddOnScreenMessage("TAStudio disengaged");
Global.MovieSession.Movie = MovieService.DefaultInstance; Global.MovieSession.Movie = MovieService.DefaultInstance;
Mainform.TakeBackControl(); Mainform.TakeBackControl();
Global.Config.MovieEndAction = _originalEndAction; Global.Config.MovieEndAction = _originalEndAction;