Change progressive -> interlaced. Not Xbox-only. (Avoid making

RageDisplay interfaces arch-specific.)

stepmania/src/PrefsManager.cpp

@@ -125,9 +125,13 @@ PrefsManager::PrefsManager()
 	 * already here than lots of people asking why songs aren't being displayed. */
 	m_bHiddenSongs = false;
 	m_bVsync = true;
+
+	/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
 #ifdef _XBOX
-	m_bProgressive = false;
+	m_bInterlaced = true;
 	m_bPAL = false;
+#else
+	m_bInterlaced = false;
 #endif
 	m_sSoundDrivers = DEFAULT_SOUND_DRIVER_LIST;
 	
@@ -161,8 +165,8 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
 		return;		// could not read config file, load nothing
 
 	ini.GetValueB( "Options", "Windowed",					m_bWindowed );
+	ini.GetValueB( "Options", "Interlaced",					m_bInterlaced );
 #ifdef _XBOX
-	ini.GetValueB( "Options", "ProgressiveScan",			m_bProgressive );
 	ini.GetValueB( "Options", "PAL",						m_bPAL );
 #endif
 	ini.GetValueI( "Options", "DisplayWidth",				m_iDisplayWidth );
@@ -303,8 +307,8 @@ void PrefsManager::SaveGlobalPrefsToDisk()
 	ini.SetValueB( "Options", "DelayedEscape",				m_bDelayedEscape );
 	ini.SetValueB( "Options", "HiddenSongs",				m_bHiddenSongs );
 	ini.SetValueB( "Options", "Vsync",						m_bVsync );
+	ini.SetValueB( "Options", "Interlaced",					m_bInterlaced );
 #ifdef _XBOX
-	ini.SetValueB( "Options", "ProgressiveScan",			m_bProgressive );
 	ini.SetValueB( "Options", "PAL",						m_bPAL );
 #endif
 	ini.SetValueB( "Options", "HowToPlay",					m_bInstructions );

stepmania/src/PrefsManager.h

@@ -34,8 +34,8 @@ public:
 	int 			m_iMovieDecodeMS;
 	bool			m_bHiddenSongs;
 	bool			m_bVsync;
+	bool			m_bInterlaced;
 #ifdef _XBOX
-	bool			m_bProgressive;
 	bool			m_bPAL;
 #endif
 	bool			m_bDelayedTextureDelete;

stepmania/src/RageDisplay.h

@@ -70,33 +70,33 @@ public:
 		// Initialize with a constructor so to guarantee all paramters
 		// are filled (in case new params are added).
 		VideoModeParams( 
-			bool _windowed,
+			bool windowed_,
-			int _width,
+			int width_,
-			int _height,
+			int height_,
-			int _bpp,
+			int bpp_,
-			int _rate,
+			int rate_,
-			bool _vsync,
+			bool vsync_,
-			bool _bAntiAliasing,
+			bool interlaced_,
-			CString _sWindowTitle,
+			bool bAntiAliasing_,
-			CString _sIconFile
+			CString sWindowTitle_,
+			CString sIconFile_
 #ifdef _XBOX
-			, bool _progressive
+			, bool PAL_
-			, bool _PAL
 #endif
 		)
 		{
-			windowed = _windowed;
+			windowed = windowed_;
-			width = _width;
+			width = width_;
-			height = _height;
+			height = height_;
-			bpp = _bpp;
+			bpp = bpp_;
-			rate = _rate;
+			rate = rate_;
-			vsync = _vsync;
+			vsync = vsync_;
-			bAntiAliasing = _bAntiAliasing;
+			interlaced = interlaced_;
-			sWindowTitle = _sWindowTitle;
+			bAntiAliasing = bAntiAliasing_;
-			sIconFile = _sIconFile;
+			sWindowTitle = sWindowTitle_;
+			sIconFile = sIconFile_;
 #ifdef _XBOX
-			progressive = _progressive;
+			PAL = PAL_;
-			PAL = _PAL;
 #endif
 		}
 		VideoModeParams() {}
@@ -108,8 +108,8 @@ public:
 		int rate;
 		bool vsync;
 		bool bAntiAliasing;
+		bool interlaced;
 #ifdef _XBOX
-		bool progressive;
 		bool PAL;
 #endif
 		CString sWindowTitle;

stepmania/src/RageDisplay_D3D.cpp

@@ -486,7 +486,7 @@ bool RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
 	g_d3dpp.Flags					=	0;
 	g_d3dpp.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
 #else
-	g_d3dpp.Flags					=	(p.progressive ? D3DPRESENTFLAG_PROGRESSIVE : D3DPRESENTFLAG_INTERLACED) | D3DPRESENTFLAG_10X11PIXELASPECTRATIO;
+	g_d3dpp.Flags					=	(p.interlaced? D3DPRESENTFLAG_INTERLACED: D3DPRESENTFLAG_PROGRESSIVE ) | D3DPRESENTFLAG_10X11PIXELASPECTRATIO;
 	g_d3dpp.FullScreen_RefreshRateInHz = p.PAL ? 50 : 60;
 #endif
 

stepmania/src/StepMania.cpp

@@ -106,11 +106,11 @@ static RageDisplay::VideoModeParams GetCurVideoModeParams()
 			PREFSMAN->m_iDisplayColorDepth,
 			PREFSMAN->m_iRefreshRate,
 			PREFSMAN->m_bVsync,
+			PREFSMAN->m_bInterlaced,
 			PREFSMAN->m_bAntiAliasing,
 			THEME->GetMetric("Common","WindowTitle"),
 			THEME->GetPathToG("Common window icon")
 #ifdef _XBOX
-			, PREFSMAN->m_bProgressive
 			, PREFSMAN->m_bPAL
 #endif
 	);