From fa52003d37123af5f987fd0b26564478fdf4b1ea Mon Sep 17 00:00:00 2001
From: mjbudd77 <mjbudd77@gmail.com>
Date: Mon, 16 Aug 2021 19:00:30 -0400
Subject: [PATCH] Fixed Qt video debug log output. Cleaned up some unused video
 functions.

---
 src/drivers/Qt/sdl-video.cpp | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/drivers/Qt/sdl-video.cpp b/src/drivers/Qt/sdl-video.cpp
index 00c321c9..99818979 100644
--- a/src/drivers/Qt/sdl-video.cpp
+++ b/src/drivers/Qt/sdl-video.cpp
@@ -59,7 +59,6 @@ static int s_srendline, s_erendline;
 static int s_tlines;
 static int s_inited = 0;
 
-static double s_exs = 1.0, s_eys = 1.0;
 static int s_eefx = 0;
 static int s_clipSides = 0;
 static int s_fullscreen = 0;
@@ -117,18 +116,7 @@ KillVideo(void)
 // this variable contains information about the special scaling filters
 static int s_sponge = 0;
 
-/**
- * These functions determine an appropriate scale factor for fullscreen/
- */
-inline double GetXScale(int xres)
-{
-	return ((double)xres) / NWIDTH;
-}
-inline double GetYScale(int yres)
-{
-	return ((double)yres) / s_tlines;
-}
-void FCEUD_VideoChanged()
+void FCEUD_VideoChanged(void)
 {
 	int buf;
 	g_config->getOption("SDL.PAL", &buf);
@@ -203,7 +191,7 @@ void CalcVideoDimensions(void)
 
 int InitVideo(FCEUGI *gi)
 {
-	int doublebuf, xstretch, ystretch, xres, yres;
+	int doublebuf, xstretch, ystretch;
 	int show_fps;
 	int startNTSC, endNTSC, startPAL, endPAL;
 
@@ -215,16 +203,12 @@ int InitVideo(FCEUGI *gi)
 	g_config->getOption("SDL.SpecialFilter", &s_sponge);
 	g_config->getOption("SDL.XStretch", &xstretch);
 	g_config->getOption("SDL.YStretch", &ystretch);
-	//g_config->getOption("SDL.LastXRes", &xres);
-	//g_config->getOption("SDL.LastYRes", &yres);
 	g_config->getOption("SDL.ClipSides", &s_clipSides);
 	g_config->getOption("SDL.NoFrame", &noframe);
 	g_config->getOption("SDL.ShowFPS", &show_fps);
 	g_config->getOption("SDL.ShowFrameCount", &frame_display);
 	g_config->getOption("SDL.ShowLagCount", &lagCounterDisplay);
 	g_config->getOption("SDL.ShowRerecordCount", &rerecord_display);
-	//g_config->getOption("SDL.XScale", &s_exs);
-	//g_config->getOption("SDL.YScale", &s_eys);
 	g_config->getOption("SDL.ScanLineStartNTSC", &startNTSC);
 	g_config->getOption("SDL.ScanLineEndNTSC", &endNTSC);
 	g_config->getOption("SDL.ScanLineStartPAL", &startPAL);
@@ -235,10 +219,6 @@ int InitVideo(FCEUGI *gi)
 
 	FCEUI_SetRenderedLines(startNTSC, endNTSC, startPAL, endPAL);
 
-	s_exs = 1.0;
-	s_eys = 1.0;
-	xres = gui_draw_area_width;
-	yres = gui_draw_area_height;
 	// check the starting, ending, and total scan lines
 
 	FCEUI_GetCurrentVidSystem(&s_srendline, &s_erendline);
@@ -316,7 +296,7 @@ int InitVideo(FCEUGI *gi)
 	s_curbpp = 32; // Bits per pixel is always 32
 
 	FCEU_printf(" Video Mode: %d x %d x %d bpp %s\n",
-				xres, yres, s_curbpp,
+				nes_shm->video.ncol, nes_shm->video.nrow, s_curbpp,
 				s_fullscreen ? "full screen" : "");
 
 	if (s_curbpp != 8 && s_curbpp != 16 && s_curbpp != 24 && s_curbpp != 32)