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

Enably NES Music Ripper only with NESHawk, also throw out vestigial method in HotkeyConfig.

This commit is contained in:
scrimpeh 2015-07-24 18:26:14 +02:00
parent 3c3cdc4590
commit 9b6ff71cac
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1206,6 +1206,8 @@ namespace BizHawk.Client.EmuHawk
&& !Global.MovieSession.Movie.IsActive; && !Global.MovieSession.Movie.IsActive;
barcodeReaderToolStripMenuItem.Enabled = ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(BarcodeEntry)); barcodeReaderToolStripMenuItem.Enabled = ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, typeof(BarcodeEntry));
musicRipperToolStripMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NESMusicRipper>();
} }
private void FdsControlsMenuItem_DropDownOpened(object sender, EventArgs e) private void FdsControlsMenuItem_DropDownOpened(object sender, EventArgs e)

5
BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
View File

@ -61,11 +61,6 @@ namespace BizHawk.Client.EmuHawk
Close(); Close();
} }
private void RestoreDefaults_Click(object sender, EventArgs e)
{
Defaults();
}
private void AutoTabCheckBox_CheckedChanged(object sender, EventArgs e) private void AutoTabCheckBox_CheckedChanged(object sender, EventArgs e)
{ {
SetAutoTab(); SetAutoTab();

6
BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk
public partial class NESMusicRipper : Form, IToolFormAutoConfig public partial class NESMusicRipper : Form, IToolFormAutoConfig
{ {
[RequiredService] [RequiredService]
private IEmulator _emu { get; set; } private NES nes { get; set; }
public NESMusicRipper() public NESMusicRipper()
{ {
@ -436,7 +436,6 @@ namespace BizHawk.Client.EmuHawk
//fpulse = fCPU/(16*(t+1)) (where fCPU is 1.789773 MHz for NTSC, 1.662607 MHz for PAL, and 1.773448 MHz for Dendy) //fpulse = fCPU/(16*(t+1)) (where fCPU is 1.789773 MHz for NTSC, 1.662607 MHz for PAL, and 1.773448 MHz for Dendy)
//ftriangle = fCPU/(32*(tval + 1)) //ftriangle = fCPU/(32*(tval + 1))
var nes = _emu as NES;
var apu = nes.apu; var apu = nes.apu;
//evaluate the pitches //evaluate the pitches
@ -485,8 +484,6 @@ namespace BizHawk.Client.EmuHawk
private void btnControl_Click(object sender, EventArgs e) private void btnControl_Click(object sender, EventArgs e)
{ {
var nes = _emu as NES;
if(IsRunning) if(IsRunning)
{ {
SyncContents(); SyncContents();
@ -512,7 +509,6 @@ namespace BizHawk.Client.EmuHawk
private void NESMusicRipper_FormClosed(object sender, FormClosedEventArgs e) private void NESMusicRipper_FormClosed(object sender, FormClosedEventArgs e)
{ {
var nes = _emu as NES;
var apu = nes.apu; var apu = nes.apu;
apu.DebugCallbackDivider = 0; apu.DebugCallbackDivider = 0;
apu.DebugCallbackTimer = 0; apu.DebugCallbackTimer = 0;