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

C64 - some cleanups - remove unused stuff, make unnecessarily public things private

This commit is contained in:
adelikat 2017-05-12 14:22:37 -05:00
parent 59ac3897da
commit 9cbe1e3112
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Computers.Commodore64.Cartridge;
using BizHawk.Emulation.Cores.Computers.Commodore64.Media;
@ -20,7 +21,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
PutSyncSettings((C64SyncSettings)syncSettings ?? new C64SyncSettings());
PutSettings((C64Settings)settings ?? new C64Settings());
ServiceProvider = new BasicServiceProvider(this);
var ser = new BasicServiceProvider(this);
ServiceProvider = ser;
InputCallbacks = new InputCallbackSystem();
CoreComm = comm;
@ -46,21 +48,20 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
if (_board.Sid != null)
{
_soundProvider = new DCFilter(_board.Sid, 512);
((BasicServiceProvider)ServiceProvider).Register<ISoundProvider>(_soundProvider);
ser.Register<ISoundProvider>(_soundProvider);
}
((BasicServiceProvider)ServiceProvider).Register<IVideoProvider>(_board.Vic);
((BasicServiceProvider)ServiceProvider).Register<IDriveLight>(this);
ser.Register<IVideoProvider>(_board.Vic);
ser.Register<IDriveLight>(this);
}
#region Internals
// IRegionable
[SaveState.DoNotSave]
public DisplayType Region { get; private set; }
[SaveState.DoNotSave]
private readonly int _cyclesPerFrame;
[SaveState.DoNotSave]
public GameInfo Game;
[SaveState.DoNotSave]
public IEnumerable<byte[]> Roms { get; private set; }
@ -89,12 +90,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
[SaveState.SaveWithName("Frame")]
private int _frame;
#endregion
// IRegionable
[SaveState.DoNotSave]
public DisplayType Region { get; private set; }
[SaveState.DoNotSave]
private ISoundProvider _soundProvider;
@ -249,7 +244,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
}
}
public void HardReset()
private void HardReset()
{
InitMedia();
_board.HardReset();