Freed from global variable

sdslabs · Aug 25, 2024 · 843cfa6 · 843cfa6
1 parent e0dcc5f
commit 843cfa6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/src/audio.cpp b/src/audio.cpp
@@ -20,7 +20,6 @@ APU::APU()
 	channel2 = new PulseChannel(CH2);
 	channel3 = new WaveChannel();
 	channel4 = new NoiseChannel();
-	globalFunction = std::bind(&APU::onWrite, this, std::placeholders::_1, std::placeholders::_2);
 }
 
 bool APU::init()

diff --git a/src/audio.h b/src/audio.h
@@ -176,4 +176,11 @@ class APU
 	void onWrite(Word address, Byte value);
 	// Write update
 	void writeUpdate(Word address, Byte value, bool WriteMem = false);
+
+	void setSignalCallback()
+	{
+		if (mMap)
+			mMap->connectObserver([this](Word address, Byte value)
+			    { this->onWrite(address, value); });
+	}
 };
diff --git a/src/gameBoy.cpp b/src/gameBoy.cpp
@@ -30,6 +30,7 @@ GBE::GBE()
 
 	// Unify the APU and MemoryMap
 	gbe_audio->setMemoryMap(gbe_mMap);
+	gbe_audio->setSignalCallback();
 
 	// Open the Boot ROM
 	if ((bootROM = fopen("../src/dmg_boot.gb", "rb")) == NULL)
@@ -40,7 +41,7 @@ GBE::GBE()
 	// 	printf("game rom file not opened");
 
 	// Open the Game ROM
-	if ((gameROM = fopen("../tests/dmg_sound/rom_singles/03-trigger.gb", "rb")) == NULL)
+	if ((gameROM = fopen("../tests/dmg_sound/rom_singles/02-len ctr.gb", "rb")) == NULL)
 		printf("game rom file not opened\n");
 
 	// Set the Boot ROM

diff --git a/src/mmap.cpp b/src/mmap.cpp
@@ -1,7 +1,7 @@
 #include "mmap.h"
 #include <cstring>
 
-std::function<void(Word, Byte)> globalFunction = nullptr;
+// std::function<void(Word, Byte)> globalFunction = nullptr;
 
 // Constructor
 MemoryMap::MemoryMap()
@@ -105,6 +105,7 @@ MemoryMap::MemoryMap()
 
 	bootRomFile = nullptr;
 	romFile = nullptr;
+	globalFunction = nullptr;
 
 	mbcMode = 0x0;
 }

diff --git a/src/mmap.h b/src/mmap.h
@@ -2,7 +2,7 @@
 #include "types.h"
 #include <stdio.h>
 #include <functional>
-extern std::function<void(Word, Byte)> globalFunction;
+// extern std::function<void(Word, Byte)> globalFunction;
 // The Memory Map for GBE
 // Pulled from https://gbdev.io/pandocs/Memory_Map.html
 
@@ -138,6 +138,8 @@ class MemoryMap
 	// Stays in the I/O Ports at 0xFF4B
 	Byte* reg_WX;
 
+	std::function<void(Word, Byte)> globalFunction;
+
 public:
 	// Audio Unit
 	// I know this is not the best way to do it
@@ -272,4 +274,7 @@ class MemoryMap
 
 	// sets the ROM file
 	void setRomFile(FILE* file) { romFile = file; }
+
+	// connects the global function
+	void connectObserver(const std::function<void(Word, Byte)>& function) { globalFunction = function; }
 };