Changed app window's title to reflect NTSC or PAL for 'Color (xxx Monitor)'

This commit is contained in:
tomcw 2020-08-17 18:29:18 +01:00
parent 4d611c20d9
commit 221e35edc7
3 changed files with 16 additions and 5 deletions

View File

@ -278,7 +278,11 @@ static void GetAppleWindowTitle()
if( IsVideoStyle(VS_HALF_SCANLINES) )
g_pAppTitle += " 50% ";
g_pAppTitle += g_apVideoModeDesc[ g_eVideoType ];
if ( g_eVideoType != VT_COLOR_MONITOR_NTSC)
g_pAppTitle += g_apVideoModeDesc[ g_eVideoType ];
else
g_pAppTitle += g_apVideoMonitorModeDesc[ GetVideoRefreshRate() == VR_60HZ ? 0 : 1 ]; // NTSC or PAL
if (g_CardMgr.GetDisk2CardMgr().IsAnyFirmware13Sector())
g_pAppTitle += " (S6-13) ";

View File

@ -112,11 +112,11 @@ static LPDIRECTDRAW g_lpDD = NULL;
// NOTE: KEEP IN SYNC: VideoType_e g_aVideoChoices g_apVideoModeDesc
// The window title will be set to this.
char *g_apVideoModeDesc[ NUM_VIDEO_MODES ] =
const char *g_apVideoModeDesc[ NUM_VIDEO_MODES ] =
{
"Monochrome Monitor (Custom)"
, "Color (RGB Monitor)"
, "Color (NTSC Monitor)"
, "Color (NTSC/PAL Monitor)"
, "Color TV"
, "B&W TV"
, "Amber Monitor"
@ -124,6 +124,12 @@ static LPDIRECTDRAW g_lpDD = NULL;
, "White Monitor"
};
const char *g_apVideoMonitorModeDesc[ 2 ] =
{
"Color (NTSC Monitor)"
, "Color (PAL Monitor)"
};
// Prototypes (Private) _____________________________________________
bool g_bDisplayPrintScreenFileName = false;

View File

@ -8,7 +8,7 @@
{
VT_MONO_CUSTOM
, VT_COLOR_MONITOR_RGB // Color rendering from AppleWin 1.25 (GH#357)
, VT_COLOR_MONITOR_NTSC
, VT_COLOR_MONITOR_NTSC // NTSC or PAL
, VT_COLOR_TV
, VT_MONO_TV
, VT_MONO_AMBER
@ -19,7 +19,8 @@
};
extern TCHAR g_aVideoChoices[];
extern char *g_apVideoModeDesc[ NUM_VIDEO_MODES ];
extern const char *g_apVideoModeDesc[ NUM_VIDEO_MODES ];
extern const char *g_apVideoMonitorModeDesc[ 2 ];
enum VideoStyle_e
{