Split part of MessageManager into non-static NotificationManager

+ Fixed movie recording/playback (for .mmo files)

Author: SourMesen

Core/AutomaticRomTest.cpp

@@ -6,6 +6,7 @@
 #include "PPU.h"
 #include "VideoDecoder.h"
 #include "StandardController.h"
+#include "NotificationManager.h"
 
 AutomaticRomTest::AutomaticRomTest()
 {
@@ -104,6 +105,7 @@ int32_t AutomaticRomTest::Run(string filename)
 {
 	EmulationSettings::SetMasterVolume(0);
 	_console.reset(new Console());
+	_console->GetNotificationManager()->RegisterNotificationListener(shared_from_this());
 	if(_console->Initialize(filename)) {
 		_console->GetControlManager()->RegisterInputProvider(this);
 

Core/AutomaticRomTest.h

@@ -6,7 +6,7 @@
 
 class Console;
 
-class AutomaticRomTest : public INotificationListener, public IInputProvider
+class AutomaticRomTest : public INotificationListener, public IInputProvider, public std::enable_shared_from_this<AutomaticRomTest>
 {
 private:
 	shared_ptr<Console> _console;

Core/CheatManager.cpp

@@ -3,6 +3,7 @@
 #include "CheatManager.h"
 #include "Console.h"
 #include "MessageManager.h"
+#include "NotificationManager.h"
 
 CheatManager::CheatManager(shared_ptr<Console> console)
 {
@@ -97,7 +98,7 @@ void CheatManager::AddCode(CodeInfo &code)
 	} else {
 		_absoluteCheatCodes.push_back(code);
 	}
-	MessageManager::SendNotification(ConsoleNotificationType::CheatAdded);
+	_console->GetNotificationManager()->SendNotification(ConsoleNotificationType::CheatAdded);
 }
 
 void CheatManager::AddGameGenieCode(string code)
@@ -138,7 +139,7 @@ void CheatManager::ClearCodes()
 	_absoluteCheatCodes.clear();
 
 	if(cheatRemoved) {
-		MessageManager::SendNotification(ConsoleNotificationType::CheatRemoved);
+		_console->GetNotificationManager()->SendNotification(ConsoleNotificationType::CheatRemoved);
 	}
 }
 

Core/Console.cpp

@@ -43,6 +43,7 @@
 #include "VideoDecoder.h"
 #include "VideoRenderer.h"
 #include "DebugHud.h"
+#include "NotificationManager.h"
 
 Console::Console()
 {
@@ -57,6 +58,7 @@ Console::~Console()
 
 void Console::Init()
 {
+	_notificationManager.reset(new NotificationManager());
 	_saveStateManager.reset(new SaveStateManager(shared_from_this()));
 	_videoRenderer.reset(new VideoRenderer(shared_from_this()));
 	_videoDecoder.reset(new VideoDecoder(shared_from_this()));
@@ -235,7 +237,7 @@ bool Console::Initialize(VirtualFile &romFile, VirtualFile &patchFile)
 				}
 
 				//Send notification only if a game was already running and we successfully loaded the new one
-				MessageManager::SendNotification(ConsoleNotificationType::GameStopped, (void*)1);
+				_notificationManager->SendNotification(ConsoleNotificationType::GameStopped, (void*)1);
 			}
 
 			if(isDifferentGame) {
@@ -321,7 +323,7 @@ bool Console::Initialize(VirtualFile &romFile, VirtualFile &patchFile)
 			ResetComponents(false);
 
 			_rewindManager.reset(new RewindManager(shared_from_this()));
-			MessageManager::RegisterNotificationListener(_rewindManager);
+			_notificationManager->RegisterNotificationListener(_rewindManager);
 
 			_videoDecoder->StartThread();
 
@@ -377,6 +379,11 @@ shared_ptr<SoundMixer> Console::GetSoundMixer()
 	return _soundMixer;
 }
 
+shared_ptr<NotificationManager> Console::GetNotificationManager()
+{
+	return _notificationManager;
+}
+
 BaseMapper* Console::GetMapper()
 {
 	return _mapper.get();
@@ -473,7 +480,8 @@ void Console::ResetComponents(bool softReset)
 
 	KeyManager::UpdateDevices();
 
-	MessageManager::SendNotification(softReset ? ConsoleNotificationType::GameReset : ConsoleNotificationType::GameLoaded);
+	//This notification MUST be sent before the UpdateInputState() below to allow MovieRecorder to grab the first frame's worth of inputs
+	_notificationManager->SendNotification(softReset ? ConsoleNotificationType::GameReset : ConsoleNotificationType::GameLoaded);
 
 	if(softReset) {
 		shared_ptr<Debugger> debugger = _debugger;
@@ -603,7 +611,7 @@ void Console::Run()
 
 				bool paused = EmulationSettings::IsPaused();
 				if(paused && !_stop) {
-					MessageManager::SendNotification(ConsoleNotificationType::GamePaused);
+					_notificationManager->SendNotification(ConsoleNotificationType::GamePaused);
 
 					//Prevent audio from looping endlessly while game is paused
 					_soundMixer->StopAudio();
@@ -625,7 +633,7 @@ void Console::Run()
 
 					PlatformUtilities::DisableScreensaver();
 					_runLock.Acquire();
-					MessageManager::SendNotification(ConsoleNotificationType::GameResumed);
+					_notificationManager->SendNotification(ConsoleNotificationType::GameResumed);
 					lastFrameTimer.Reset();
 				}
 
@@ -668,7 +676,7 @@ void Console::Run()
 
 	_running = false;
 
-	MessageManager::SendNotification(ConsoleNotificationType::BeforeEmulationStop);
+	_notificationManager->SendNotification(ConsoleNotificationType::BeforeEmulationStop);
 
 	if(!crashed) {
 		_saveStateManager->SaveRecentGame(GetMapperInfo().RomName, _romFilepath, _patchFilename);
@@ -703,8 +711,8 @@ void Console::Run()
 
 	_emulationThreadId = std::thread::id();
 
-	MessageManager::SendNotification(ConsoleNotificationType::GameStopped);
-	MessageManager::SendNotification(ConsoleNotificationType::EmulationStopped);
+	_notificationManager->SendNotification(ConsoleNotificationType::GameStopped);
+	_notificationManager->SendNotification(ConsoleNotificationType::EmulationStopped);
 }
 
 bool Console::IsRunning()
@@ -747,7 +755,7 @@ void Console::UpdateNesModel(bool sendNotification)
 	_apu->SetNesModel(model);
 
 	if(configChanged && sendNotification) {
-		MessageManager::SendNotification(ConsoleNotificationType::ConfigChanged);
+		_notificationManager->SendNotification(ConsoleNotificationType::ConfigChanged);
 	}
 }
 
@@ -813,7 +821,7 @@ void Console::LoadState(istream &loadStream, uint32_t stateVersion)
 			debugger->ResetCounters();
 		}
 
-		MessageManager::SendNotification(ConsoleNotificationType::StateLoaded);
+		_notificationManager->SendNotification(ConsoleNotificationType::StateLoaded);
 	}
 }
 

Core/Console.h

@@ -25,6 +25,7 @@ class VideoDecoder;
 class VideoRenderer;
 class DebugHud;
 class SoundMixer;
+class NotificationManager;
 
 struct HdPackData;
 enum class NesModel;
@@ -59,6 +60,7 @@ class Console : public std::enable_shared_from_this<Console>
 	shared_ptr<CheatManager> _cheatManager;
 	shared_ptr<DebugHud> _debugHud;
 	shared_ptr<SoundMixer> _soundMixer;
+	shared_ptr<NotificationManager> _notificationManager;
 
 	shared_ptr<HdPackBuilder> _hdPackBuilder;
 	shared_ptr<HdPackData> _hdData;
@@ -96,6 +98,7 @@ class Console : public std::enable_shared_from_this<Console>
 	shared_ptr<VideoRenderer> GetVideoRenderer();
 	shared_ptr<DebugHud> GetDebugHud();
 	shared_ptr<SoundMixer> GetSoundMixer();
+	shared_ptr<NotificationManager> GetNotificationManager();
 
 	void ProcessCpuClock();
 	CPU* GetCpu();

Core/Core.vcxproj

@@ -546,6 +546,7 @@
     <ClInclude Include="MMC3_224.h" />
     <ClInclude Include="MovieRecorder.h" />
     <ClInclude Include="AsciiTurboFile.h" />
+    <ClInclude Include="NotificationManager.h" />
     <ClInclude Include="OpenBusHandler.h" />
     <ClInclude Include="RawVideoFilter.h" />
     <ClInclude Include="Sachen9602.h" />
@@ -959,15 +960,20 @@
     <ClCompile Include="DebugHud.cpp" />
     <ClCompile Include="DrawRectangleCommand.h" />
     <ClCompile Include="FceuxMovie.cpp" />
+    <ClCompile Include="FdsLoader.cpp" />
     <ClCompile Include="HdAudioDevice.cpp" />
     <ClCompile Include="HdNesPack.cpp" />
     <ClCompile Include="HdPackBuilder.cpp" />
     <ClCompile Include="HdPackLoader.cpp" />
+    <ClCompile Include="HdPpu.cpp" />
     <ClCompile Include="KeyManager.cpp" />
     <ClCompile Include="LuaApi.cpp" />
     <ClCompile Include="LuaCallHelper.cpp" />
     <ClCompile Include="LuaScriptingContext.cpp" />
     <ClCompile Include="MovieRecorder.cpp" />
+    <ClCompile Include="NotificationManager.cpp" />
+    <ClCompile Include="NsfLoader.cpp" />
+    <ClCompile Include="NsfPpu.cpp" />
     <ClCompile Include="OggMixer.cpp" />
     <ClCompile Include="OggReader.cpp" />
     <ClCompile Include="RawVideoFilter.cpp" />

Core/Core.vcxproj.filters

@@ -1453,6 +1453,9 @@
     <ClInclude Include="Bmc60311C.h">
       <Filter>Nes\Mappers\Unif</Filter>
     </ClInclude>
+    <ClInclude Include="NotificationManager.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -1722,5 +1725,20 @@
     <ClCompile Include="BaseExpansionAudio.cpp">
       <Filter>Misc</Filter>
     </ClCompile>
+    <ClCompile Include="NotificationManager.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="NsfPpu.cpp">
+      <Filter>Nes</Filter>
+    </ClCompile>
+    <ClCompile Include="HdPpu.cpp">
+      <Filter>HdPacks</Filter>
+    </ClCompile>
+    <ClCompile Include="NsfLoader.cpp">
+      <Filter>Nes\RomLoader</Filter>
+    </ClCompile>
+    <ClCompile Include="FdsLoader.cpp">
+      <Filter>Nes\RomLoader</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Core/Debugger.cpp

@@ -27,6 +27,7 @@
 #include "TraceLogger.h"
 #include "Breakpoint.h"
 #include "CodeDataLogger.h"
+#include "NotificationManager.h"
 
 #ifndef UINT32_MAX
 #define UINT32_MAX  ((uint32_t)-1)
@@ -445,7 +446,7 @@ void Debugger::ProcessPpuCycle()
 		int32_t currentCycle = (_ppu->GetCurrentCycle() << 9) + _ppu->GetCurrentScanline();
 		for(auto updateCycle : _ppuViewerUpdateCycle) {
 			if(updateCycle.second == currentCycle) {
-				MessageManager::SendNotification(ConsoleNotificationType::PpuViewerDisplayFrame, (void*)(uint64_t)updateCycle.first);
+				_console->GetNotificationManager()->SendNotification(ConsoleNotificationType::PpuViewerDisplayFrame, (void*)(uint64_t)updateCycle.first);
 			}
 		}
 
@@ -691,7 +692,7 @@ bool Debugger::SleepUntilResume(BreakSource source)
 
 		if(_preventResume == 0) {
 			_console->GetSoundMixer()->StopAudio();
-			MessageManager::SendNotification(ConsoleNotificationType::CodeBreak, (void*)(uint64_t)source);
+			_console->GetNotificationManager()->SendNotification(ConsoleNotificationType::CodeBreak, (void*)(uint64_t)source);
 			ProcessEvent(EventType::CodeBreak);
 			_stepOverAddr = -1;
 			if(CheckFlag(DebuggerFlags::PpuPartialDraw)) {
@@ -1340,7 +1341,7 @@ void Debugger::ProcessEvent(EventType type)
 		_memoryDumper->GatherChrPaletteInfo();
 	} else if(type == EventType::StartFrame) {
 		//Update the event viewer
-		MessageManager::SendNotification(ConsoleNotificationType::EventViewerDisplayFrame);
+		_console->GetNotificationManager()->SendNotification(ConsoleNotificationType::EventViewerDisplayFrame);
 
 		//Clear the current frame/event log
 		if(CheckFlag(DebuggerFlags::PpuPartialDraw)) {

Core/EmulationSettings.h

@@ -1039,7 +1039,8 @@ class EmulationSettings
 
 			UpdateEffectiveOverclockRate();
 
-			MessageManager::SendNotification(ConsoleNotificationType::ConfigChanged);
+			//TODOCONSOLE
+			//MessageManager::SendNotification(ConsoleNotificationType::ConfigChanged);
 
 			MessageManager::DisplayMessage("ClockRate", std::to_string((uint32_t)EmulationSettings::GetOverclockRate()) + "%");
 		}