From e1dee116c7804d63316c24e0d2357295570f2f61 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 8 Apr 2009 19:28:49 +0000 Subject: [PATCH] remove unused GetMonitorAspectRatio --- stepmania/src/RageDisplay.h | 1 - stepmania/src/RageDisplay_D3D.cpp | 10 ---------- stepmania/src/RageDisplay_D3D.h | 1 - stepmania/src/RageDisplay_Null.h | 1 - stepmania/src/RageDisplay_OGL.cpp | 5 ----- stepmania/src/RageDisplay_OGL.h | 1 - stepmania/src/arch/LowLevelWindow/LowLevelWindow.h | 1 - .../src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h | 1 - .../src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp | 5 ----- .../src/arch/LowLevelWindow/LowLevelWindow_Win32.h | 1 - .../src/arch/LowLevelWindow/LowLevelWindow_X11.cpp | 5 ----- .../src/arch/LowLevelWindow/LowLevelWindow_X11.h | 1 - stepmania/src/archutils/Win32/GraphicsWindow.cpp | 12 ------------ stepmania/src/archutils/Win32/GraphicsWindow.h | 1 - 14 files changed, 46 deletions(-) diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h index 657b7b6b17..f10abfd499 100644 --- a/stepmania/src/RageDisplay.h +++ b/stepmania/src/RageDisplay.h @@ -178,7 +178,6 @@ public: virtual RString GetApiDescription() const = 0; virtual void GetDisplayResolutions( DisplayResolutions &out ) const = 0; - virtual float GetMonitorAspectRatio() const = 0; // Don't override this. Override TryVideoMode() instead. // This will set the video mode to be as close as possible to params. diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index 3c2ff18fc2..d22a797603 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -325,16 +325,6 @@ void RageDisplay_D3D::GetDisplayResolutions( DisplayResolutions &out ) const } } -float RageDisplay_D3D::GetMonitorAspectRatio() const -{ -#if defined(XBOX) - VideoModeParams p = GetActualVideoModeParams(); - return p.width / (float)p.height; -#else - return g_DesktopMode.Width / (float)g_DesktopMode.Height; -#endif -} - D3DFORMAT FindBackBufferType(bool bWindowed, int iBPP) { HRESULT hr; diff --git a/stepmania/src/RageDisplay_D3D.h b/stepmania/src/RageDisplay_D3D.h index 7012d7494e..581cc3e40d 100644 --- a/stepmania/src/RageDisplay_D3D.h +++ b/stepmania/src/RageDisplay_D3D.h @@ -12,7 +12,6 @@ public: virtual RString GetApiDescription() const { return "D3D"; } virtual void GetDisplayResolutions( DisplayResolutions &out ) const; - virtual float GetMonitorAspectRatio() const; void ResolutionChanged(); const PixelFormatDesc *GetPixelFormatDesc(PixelFormat pf) const; diff --git a/stepmania/src/RageDisplay_Null.h b/stepmania/src/RageDisplay_Null.h index 267d910a7d..054d3664a7 100644 --- a/stepmania/src/RageDisplay_Null.h +++ b/stepmania/src/RageDisplay_Null.h @@ -11,7 +11,6 @@ public: virtual RString GetApiDescription() const { return "Null"; } virtual void GetDisplayResolutions( DisplayResolutions &out ) const; - virtual float GetMonitorAspectRatio() const { return 4/3.f; } const PixelFormatDesc *GetPixelFormatDesc(PixelFormat pf) const; bool BeginFrame() { return true; } diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 98a47203da..6d674d6ab0 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -536,11 +536,6 @@ void RageDisplay_OGL::GetDisplayResolutions( DisplayResolutions &out ) const g_pWind->GetDisplayResolutions( out ); } -float RageDisplay_OGL::GetMonitorAspectRatio() const -{ - return g_pWind->GetMonitorAspectRatio(); -} - static void CheckPalettedTextures() { RString sError; diff --git a/stepmania/src/RageDisplay_OGL.h b/stepmania/src/RageDisplay_OGL.h index 4df1cb7a6b..f620d08d60 100644 --- a/stepmania/src/RageDisplay_OGL.h +++ b/stepmania/src/RageDisplay_OGL.h @@ -14,7 +14,6 @@ public: virtual RString GetApiDescription() const { return "OpenGL"; } virtual void GetDisplayResolutions( DisplayResolutions &out ) const; - virtual float GetMonitorAspectRatio() const; void ResolutionChanged(); const PixelFormatDesc *GetPixelFormatDesc(PixelFormat pf) const; diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h index 67ae5b08c5..08281459b8 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h @@ -25,7 +25,6 @@ public: // need to be reloaded. virtual RString TryVideoMode( const VideoModeParams &p, bool &bNewDeviceOut ) = 0; virtual void GetDisplayResolutions( DisplayResolutions &out ) const = 0; - virtual float GetMonitorAspectRatio() const = 0; virtual void LogDebugInformation() const { } virtual bool IsSoftwareRenderer( RString &sError ) { return false; } diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h index 35a013e4c9..21f1568d62 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h @@ -25,7 +25,6 @@ public: void *GetProcAddress( RString s ); RString TryVideoMode( const VideoModeParams& p, bool& newDeviceOut ); void GetDisplayResolutions( DisplayResolutions &dr ) const; - float GetMonitorAspectRatio() const; void SwapBuffers(); void Update(); diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp index b1675a048a..e0b0590821 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp @@ -62,11 +62,6 @@ void LowLevelWindow_Win32::GetDisplayResolutions( DisplayResolutions &out ) cons GraphicsWindow::GetDisplayResolutions( out ); } -float LowLevelWindow_Win32::GetMonitorAspectRatio() const -{ - return GraphicsWindow::GetMonitorAspectRatio(); -} - int ChooseWindowPixelFormat( const VideoModeParams &p, PIXELFORMATDESCRIPTOR *PixelFormat ) { ASSERT( GraphicsWindow::GetHwnd() != NULL ); diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h index 731743a6b1..ff96ebfbc9 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.h @@ -11,7 +11,6 @@ public: void *GetProcAddress( RString s ); RString TryVideoMode( const VideoModeParams &p, bool &bNewDeviceOut ); void GetDisplayResolutions( DisplayResolutions &out ) const; - float GetMonitorAspectRatio() const; bool IsSoftwareRenderer( RString &sError ); void SwapBuffers(); void Update(); diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp index 6111387735..73c035dcff 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp @@ -316,11 +316,6 @@ void LowLevelWindow_X11::GetDisplayResolutions( DisplayResolutions &out ) const } } -float LowLevelWindow_X11::GetMonitorAspectRatio() const -{ - return 4.0f/3; -} - bool LowLevelWindow_X11::SupportsThreadedRendering() { return g_pBackgroundContext != NULL; diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h index f4752ffc9f..ee149792a7 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h @@ -21,7 +21,6 @@ public: const VideoModeParams &GetActualVideoModeParams() const { return CurrentParams; } void GetDisplayResolutions( DisplayResolutions &out ) const; - float GetMonitorAspectRatio() const; bool SupportsRenderToTexture() const; RenderTarget *CreateRenderTarget(); diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.cpp b/stepmania/src/archutils/Win32/GraphicsWindow.cpp index 989e184628..8e9ccc1d84 100644 --- a/stepmania/src/archutils/Win32/GraphicsWindow.cpp +++ b/stepmania/src/archutils/Win32/GraphicsWindow.cpp @@ -518,18 +518,6 @@ void GraphicsWindow::GetDisplayResolutions( DisplayResolutions &out ) } } -float GraphicsWindow::GetMonitorAspectRatio() -{ - // There's no way to query the monitor for this, so assume that the - // normal desktop resolution is using square pixels. - DEVMODE dm; - ZERO( dm ); - dm.dmSize = sizeof(dm); - BOOL bResult = EnumDisplaySettings( NULL, ENUM_REGISTRY_SETTINGS, &dm ); - ASSERT( bResult ); - return dm.dmPelsWidth / (float)dm.dmPelsHeight; -} - /* * (c) 2004 Glenn Maynard diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.h b/stepmania/src/archutils/Win32/GraphicsWindow.h index e91c56021b..e730831e51 100644 --- a/stepmania/src/archutils/Win32/GraphicsWindow.h +++ b/stepmania/src/archutils/Win32/GraphicsWindow.h @@ -25,7 +25,6 @@ namespace GraphicsWindow void DestroyGraphicsWindow(); void GetDisplayResolutions( DisplayResolutions &out ); - float GetMonitorAspectRatio(); const VideoModeParams &GetParams(); HDC GetHDC();