gearmulator

commit b2cd800a8a4d6466fd5aaa5e6cb37d9efc03a9ae
parent 9bcbabb760d543887873c9e20bed6918a3d960c4
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sun, 28 Jul 2024 21:37:21 +0200

cleanup

Diffstat:
M
source/nord/n2x/n2xLib/n2xfrontpanel.h
 | 
3
++-
M
source/nord/n2x/n2xLib/n2xhardware.cpp
 | 
2
+-
M
source/nord/n2x/n2xLib/n2xmc.cpp
 | 
15
++-------------
M
source/nord/n2x/n2xLib/n2xmc.h
 | 
2
+-

4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/source/nord/n2x/n2xLib/n2xfrontpanel.h b/source/nord/n2x/n2xLib/n2xfrontpanel.h
@@ -20,8 +20,9 @@ namespace n2x
 	class FrontPanelCS4 : public FrontPanelCS<g_frontPanelAddressCS4>
 	{
 	public:
-		uint8_t read8(mc68k::PeriphAddress _addr) override;
 		explicit FrontPanelCS4(FrontPanel& _fp);
+
+		uint8_t read8(mc68k::PeriphAddress _addr) override;
 	};
 
 	class FrontPanelCS6 : public FrontPanelCS<g_frontPanelAddressCS6>
diff --git a/source/nord/n2x/n2xLib/n2xhardware.cpp b/source/nord/n2x/n2xLib/n2xhardware.cpp
@@ -19,7 +19,7 @@ namespace n2x
 			return;
 
 		m_dspA.getPeriph().getEsai().setCallback([this](dsp56k::Audio*){ onEsaiCallbackA(); }, 0);
-		m_dspB.getPeriph().getEsai().setCallback([this](dsp56k::Audio*) { onEsaiCallbackB(); }, 0);
+		m_dspB.getPeriph().getEsai().setCallback([this](dsp56k::Audio*){ onEsaiCallbackB(); }, 0);
 	}
 
 	bool Hardware::isValid() const
diff --git a/source/nord/n2x/n2xLib/n2xmc.cpp b/source/nord/n2x/n2xLib/n2xmc.cpp
@@ -126,7 +126,7 @@ namespace n2x
 		}
 		if(_addr >= g_ramAddress && _addr < g_ramAddress + g_ramSize)
 		{
-			const auto r = readW(m_ram.data(), _addr - g_ramAddress);;
+			const auto r = readW(m_ram.data(), _addr - g_ramAddress);
 //			LOG("read " << HEX(_addr) << "=" << HEXN(r,4));
 			return r;
 		}
@@ -362,17 +362,6 @@ namespace n2x
 //		m_hdi08A.exec(cycles);
 //		m_hdi08B.exec(cycles);
 
-/*
-		m_totalCycles += cycles;
-		if(m_totalCycles > 0x5000000 && !m_hasSentMidi)
-		{
-			m_totalCycles -= 0x5000000;
-//			m_hasSentMidi = true;
-			LOG("Sending MIDI Note On");
-			m_midi.writeMidi(synthLib::M_NOTEON);
-			m_midi.writeMidi((rand()%24) + synthLib::Note_C2);
-			m_midi.writeMidi(127);
-		}
-*/		return cycles;
+		return cycles;
 	}
 }
diff --git a/source/nord/n2x/n2xLib/n2xmc.h b/source/nord/n2x/n2xLib/n2xmc.h
@@ -20,7 +20,7 @@ namespace n2x
 
 		auto& getHdi08A() { return m_hdi08A.getHdi08(); }
 		auto& getHdi08B() { return m_hdi08B.getHdi08(); }
-		auto& getMidi() const	{ return m_midi; }
+		auto& getMidi() { return m_midi; }
 
 		uint32_t exec() override;