empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update scaling in History Viewer

Browse source
This commit is contained in:
NovaSquirrel 2020-10-08 01:54:35 -04:00
parent 40d4e21cb1
commit 117e6265b0
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
InteropDLL/EmuApiWrapper.cpp
View file

@ -132,6 +132,12 @@ extern "C" {
GetConsoleById(consoleId)->GetSettings()->SetAudioConfig(config); GetConsoleById(consoleId)->GetSettings()->SetAudioConfig(config);
} }
DllExport void __stdcall SetVideoScale(double scale, ConsoleId consoleId) {
VideoConfig config = GetConsoleById(consoleId)->GetSettings()->GetVideoConfig();
config.VideoScale = scale;
GetConsoleById(consoleId)->GetSettings()->SetVideoConfig(config);
}
DllExport void __stdcall SetFullscreenMode(bool fullscreen, void *windowHandle, uint32_t monitorWidth, uint32_t monitorHeight) DllExport void __stdcall SetFullscreenMode(bool fullscreen, void *windowHandle, uint32_t monitorWidth, uint32_t monitorHeight)
{ {

5
InteropDLL/HistoryViewerWrapper.cpp
View file

@ -4,6 +4,7 @@
#include "../Core/SoundMixer.h" #include "../Core/SoundMixer.h"
#include "../Core/MovieManager.h" #include "../Core/MovieManager.h"
#include "../Core/RewindManager.h" #include "../Core/RewindManager.h"
#include "../Core/EmuSettings.h"
#ifdef _WIN32 #ifdef _WIN32
#include "../Windows/Renderer.h" #include "../Windows/Renderer.h"
@ -41,9 +42,11 @@ extern "C"
_historyConsole->Unlock(); _historyConsole->Unlock();
//Force some settings //Force some settings
VideoConfig config = _historyConsole->GetSettings()->GetVideoConfig();
config.VideoScale = 2;
_historyConsole->GetSettings()->SetVideoConfig(config);
// TODO // TODO
// _historyConsole->GetSettings()->SetEmulationSpeed(100); // _historyConsole->GetSettings()->SetEmulationSpeed(100);
// _historyConsole->GetSettings()->SetVideoScale(2);
// _historyConsole->GetSettings()->ClearFlags(EmulationFlags::InBackground | EmulationFlags::Rewind /*|EmulationFlags::ForceMaxSpeed | EmulationFlags::DebuggerWindowEnabled*/); // _historyConsole->GetSettings()->ClearFlags(EmulationFlags::InBackground | EmulationFlags::Rewind /*|EmulationFlags::ForceMaxSpeed | EmulationFlags::DebuggerWindowEnabled*/);
#ifdef _WIN32 #ifdef _WIN32

2
UI/Forms/frmHistoryViewer.cs
View file

@ -102,7 +102,7 @@ namespace Mesen.GUI.Forms
double verticalScale = (double)dimensions.Height / size.Height; double verticalScale = (double)dimensions.Height / size.Height;
double horizontalScale = (double)dimensions.Width / size.Width; double horizontalScale = (double)dimensions.Width / size.Width;
double scale = Math.Min(verticalScale, horizontalScale); double scale = Math.Min(verticalScale, horizontalScale);
// InteropEmu.SetVideoScale(scale, InteropEmu.ConsoleId.HistoryViewer); TODO EmuApi.SetVideoScale(scale, EmuApi.ConsoleId.HistoryViewer);
} }
private void tmrUpdatePosition_Tick(object sender, EventArgs e) private void tmrUpdatePosition_Tick(object sender, EventArgs e)

1
UI/Interop/EmuApi.cs
View file

@ -37,6 +37,7 @@ namespace Mesen.GUI
} }
[DllImport(DllPath)] public static extern void SetMasterVolume(double volume, ConsoleId consoleId); [DllImport(DllPath)] public static extern void SetMasterVolume(double volume, ConsoleId consoleId);
[DllImport(DllPath)] public static extern void SetVideoScale(double scale, ConsoleId consoleId);
[DllImport(DllPath)] public static extern IntPtr RegisterNotificationCallback(NotificationListener.NotificationCallback callback); [DllImport(DllPath)] public static extern IntPtr RegisterNotificationCallback(NotificationListener.NotificationCallback callback);
[DllImport(DllPath)] public static extern void UnregisterNotificationCallback(IntPtr notificationListener); [DllImport(DllPath)] public static extern void UnregisterNotificationCallback(IntPtr notificationListener);