From afdb20cb00c8acd83327fd5fb42d3cee873da36e Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Thu, 4 Nov 2021 12:49:37 +0100 Subject: [PATCH] RMG: use RMG-Core's Video functions --- Source/RMG/UserInterface/MainWindow.cpp | 8 ++++---- Source/RMG/UserInterface/Widget/OGLWidget.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/RMG/UserInterface/MainWindow.cpp b/Source/RMG/UserInterface/MainWindow.cpp index 60bb142c..92fb4923 100644 --- a/Source/RMG/UserInterface/MainWindow.cpp +++ b/Source/RMG/UserInterface/MainWindow.cpp @@ -1066,9 +1066,9 @@ void MainWindow::on_Action_System_GSButton(void) void MainWindow::on_Action_Options_FullScreen(void) { - if (!g_MupenApi.Core.ToggleFullscreen()) + if (!CoreToggleFullscreen()) { - this->ui_MessageBox("Error", "Api::Core::ToggleFullscreen Failed", g_MupenApi.Core.GetLastError()); + this->ui_MessageBox("Error", "CoreToggleFullscreen() Failed", QString::fromStdString(CoreGetError())); } } @@ -1183,7 +1183,7 @@ void MainWindow::on_VidExt_SetWindowedModeWithRate(int width, int height, int re this->ui_VidExt_Geometry_Saved = false; // force 'refresh' the video plugin - g_MupenApi.Core.SetVideoSize(width, height, true); + CoreSetVideoSize(width, height); } if (this->isFullScreen()) @@ -1208,7 +1208,7 @@ void MainWindow::on_VidExt_SetFullscreenModeWithRate(int width, int height, int this->ui_VidExt_Geometry_Saved = true; // force 'refresh' the video plugin - g_MupenApi.Core.SetVideoSize(width, height, true); + CoreSetVideoSize(width, height); } if (!this->isFullScreen()) diff --git a/Source/RMG/UserInterface/Widget/OGLWidget.cpp b/Source/RMG/UserInterface/Widget/OGLWidget.cpp index 9511926e..12325531 100644 --- a/Source/RMG/UserInterface/Widget/OGLWidget.cpp +++ b/Source/RMG/UserInterface/Widget/OGLWidget.cpp @@ -1,10 +1,10 @@ #include "OGLWidget.hpp" #include "../../Globals.hpp" -#include using namespace UserInterface::Widget; #include +#include OGLWidget::OGLWidget(QWidget *parent) { @@ -69,7 +69,7 @@ void OGLWidget::resizeEvent(QResizeEvent *event) void OGLWidget::timerEvent(QTimerEvent *event) { - g_MupenApi.Core.SetVideoSize(this->width, this->height, false); + CoreSetVideoSize(this->width, this->height); // remove current timer this->killTimer(this->timerId);