From e227697531703307f8bb0f3c401d4c013c0dbdc8 Mon Sep 17 00:00:00 2001
From: Sour <mesenemu@gmail.com>
Date: Thu, 21 Dec 2017 15:37:57 -0500
Subject: [PATCH] Lua: Renamed DMC "frequency" to "sampleRate" and added
 clockRate to getState() table.

---
 Core/DeltaModulationChannel.cpp | 2 +-
 Core/LuaApi.cpp                 | 3 ++-
 Core/Types.h                    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Core/DeltaModulationChannel.cpp b/Core/DeltaModulationChannel.cpp
index e78f2641..201c7389 100644
--- a/Core/DeltaModulationChannel.cpp
+++ b/Core/DeltaModulationChannel.cpp
@@ -216,11 +216,11 @@ ApuDmcState DeltaModulationChannel::GetState()
 {
 	ApuDmcState state;
 	state.BytesRemaining = _bytesRemaining;
-	state.Frequency = CPU::GetClockRate(GetNesModel()) / 32.0 / (_period + 1);
 	state.IrqEnabled = _irqEnabled;
 	state.Loop = _loopFlag;
 	state.OutputVolume = _lastOutput;
 	state.Period = _period;
+	state.SampleRate = CPU::GetClockRate(GetNesModel()) / (_period + 1);
 	state.SampleAddr = _sampleAddr;
 	state.SampleLength = _sampleLength;
 	return state;
diff --git a/Core/LuaApi.cpp b/Core/LuaApi.cpp
index 9173ed5b..c6cd36b8 100644
--- a/Core/LuaApi.cpp
+++ b/Core/LuaApi.cpp
@@ -744,6 +744,7 @@ int LuaApi::GetState(lua_State *lua)
 
 	lua_newtable(lua);
 	lua_pushintvalue(region, state.Model);
+	lua_pushintvalue(clockRate, CPU::GetClockRate(Console::GetModel()));
 
 	lua_starttable("cpu");
 	lua_pushintvalue(a, state.CPU.A);
@@ -858,7 +859,7 @@ int LuaApi::GetState(lua_State *lua)
 
 	lua_starttable("dmc");
 	lua_pushintvalue(bytesRemaining, state.APU.Dmc.BytesRemaining);
-	lua_pushdoublevalue(frequency, state.APU.Dmc.Frequency);
+	lua_pushdoublevalue(sampleRate, state.APU.Dmc.SampleRate);
 	lua_pushboolvalue(irqEnabled, state.APU.Dmc.IrqEnabled);
 	lua_pushboolvalue(loop, state.APU.Dmc.Loop);
 	lua_pushintvalue(outputVolume, state.APU.Dmc.OutputVolume);
diff --git a/Core/Types.h b/Core/Types.h
index 2066c5a3..7606fc43 100644
--- a/Core/Types.h
+++ b/Core/Types.h
@@ -202,6 +202,7 @@ struct ApuNoiseState
 
 struct ApuDmcState
 {
+	double SampleRate;
 	uint16_t SampleAddr;
 	uint16_t SampleLength;
 
@@ -210,7 +211,6 @@ struct ApuDmcState
 	uint16_t Period;
 	uint16_t BytesRemaining;
 
-	double Frequency;
 	uint8_t OutputVolume;
 };