Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-10 13:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Small refactor for app window's title

Browse Source
This commit is contained in:
tomcw 2020-08-17 19:26:06 +01:00
parent 221e35edc7
commit 039ad8a547
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Frame.cpp
View File

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

23
source/Video.cpp
View File

@ -124,12 +124,6 @@ static LPDIRECTDRAW g_lpDD = NULL;
, "White Monitor" , "White Monitor"
}; };
const char *g_apVideoMonitorModeDesc[ 2 ] =
{
"Color (NTSC Monitor)"
, "Color (PAL Monitor)"
};
// Prototypes (Private) _____________________________________________ // Prototypes (Private) _____________________________________________
bool g_bDisplayPrintScreenFileName = false; bool g_bDisplayPrintScreenFileName = false;
@ -1442,3 +1436,20 @@ static void videoCreateDIBSection()
// CREATE THE OFFSET TABLE FOR EACH SCAN LINE IN THE FRAME BUFFER // CREATE THE OFFSET TABLE FOR EACH SCAN LINE IN THE FRAME BUFFER
NTSC_VideoInit( g_pFramebufferbits ); NTSC_VideoInit( g_pFramebufferbits );
} }
//===========================================================================
const char* VideoGetAppWindowTitle(void)
{
static const char *apVideoMonitorModeDesc[ 2 ] =
{
"Color (NTSC Monitor)",
"Color (PAL Monitor)"
};
const VideoType_e videoType = GetVideoType();
if ( videoType != VT_COLOR_MONITOR_NTSC)
return g_apVideoModeDesc[ videoType ];
else
return apVideoMonitorModeDesc[ GetVideoRefreshRate() == VR_60HZ ? 0 : 1 ]; // NTSC or PAL
}

4
source/Video.h
View File

@ -19,8 +19,6 @@
}; };
extern TCHAR g_aVideoChoices[]; extern TCHAR g_aVideoChoices[];
extern const char *g_apVideoModeDesc[ NUM_VIDEO_MODES ];
extern const char *g_apVideoMonitorModeDesc[ 2 ];
enum VideoStyle_e enum VideoStyle_e
{ {
@ -241,3 +239,5 @@ void SetVideoRefreshRate(VideoRefreshRate_e rate);
bool DDInit(void); bool DDInit(void);
void DDUninit(void); void DDUninit(void);
const char* VideoGetAppWindowTitle(void);