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

Refactor: int bVideoMode -> uint32_t uVideoMode

Browse Source
This commit is contained in:
tomcw 2016-11-06 21:59:45 +00:00
parent 421d9a77f6
commit 981b711fef
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Debugger/Debug.cpp
View File

@ -427,7 +427,7 @@ public:
private: private:
bool m_bIsVideoModeValid; bool m_bIsVideoModeValid;
UINT m_uVideoMode; uint32_t m_uVideoMode;
static DebugVideoMode m_Instance; static DebugVideoMode m_Instance;
}; };

24
source/NTSC.cpp
View File

@ -1500,35 +1500,35 @@ void NTSC_SetVideoTextMode( int cols )
} }
//=========================================================================== //===========================================================================
void NTSC_SetVideoMode( int bVideoModeFlags ) void NTSC_SetVideoMode( uint32_t uVideoModeFlags )
{ {
int h = g_nVideoClockHorz; int h = g_nVideoClockHorz;
g_aHorzClockVideoMode[ h ] = bVideoModeFlags; g_aHorzClockVideoMode[ h ] = uVideoModeFlags;
g_nVideoMixed = bVideoModeFlags & VF_MIXED; g_nVideoMixed = uVideoModeFlags & VF_MIXED;
g_nVideoCharSet = VideoGetSWAltCharSet() ? 1 : 0; g_nVideoCharSet = VideoGetSWAltCharSet() ? 1 : 0;
g_nTextPage = 1; g_nTextPage = 1;
g_nHiresPage = 1; g_nHiresPage = 1;
if (bVideoModeFlags & VF_PAGE2) { if (uVideoModeFlags & VF_PAGE2) {
// Apple IIe, Technical Notes, #3: Double High-Resolution Graphics // Apple IIe, Technical Notes, #3: Double High-Resolution Graphics
// 80STORE must be OFF to display page 2 // 80STORE must be OFF to display page 2
if (0 == (bVideoModeFlags & VF_80STORE)) { if (0 == (uVideoModeFlags & VF_80STORE)) {
g_nTextPage = 2; g_nTextPage = 2;
g_nHiresPage = 2; g_nHiresPage = 2;
} }
} }
if (bVideoModeFlags & VF_TEXT) { if (uVideoModeFlags & VF_TEXT) {
if (bVideoModeFlags & VF_80COL) if (uVideoModeFlags & VF_80COL)
g_pFuncUpdateGraphicsScreen = updateScreenText80; g_pFuncUpdateGraphicsScreen = updateScreenText80;
else else
g_pFuncUpdateGraphicsScreen = updateScreenText40; g_pFuncUpdateGraphicsScreen = updateScreenText40;
} }
else if (bVideoModeFlags & VF_HIRES) { else if (uVideoModeFlags & VF_HIRES) {
if (bVideoModeFlags & VF_DHIRES) if (uVideoModeFlags & VF_DHIRES)
if (bVideoModeFlags & VF_80COL) if (uVideoModeFlags & VF_80COL)
g_pFuncUpdateGraphicsScreen = updateScreenDoubleHires80; g_pFuncUpdateGraphicsScreen = updateScreenDoubleHires80;
else else
g_pFuncUpdateGraphicsScreen = updateScreenDoubleHires40; g_pFuncUpdateGraphicsScreen = updateScreenDoubleHires40;
@ -1536,8 +1536,8 @@ void NTSC_SetVideoMode( int bVideoModeFlags )
g_pFuncUpdateGraphicsScreen = updateScreenSingleHires40; g_pFuncUpdateGraphicsScreen = updateScreenSingleHires40;
} }
else { else {
if (bVideoModeFlags & VF_DHIRES) if (uVideoModeFlags & VF_DHIRES)
if (bVideoModeFlags & VF_80COL) if (uVideoModeFlags & VF_80COL)
g_pFuncUpdateGraphicsScreen = updateScreenDoubleLores80; g_pFuncUpdateGraphicsScreen = updateScreenDoubleLores80;
else else
g_pFuncUpdateGraphicsScreen = updateScreenDoubleLores40; g_pFuncUpdateGraphicsScreen = updateScreenDoubleLores40;

2
source/NTSC.h
View File

@ -7,7 +7,7 @@
extern uint32_t g_nChromaSize; extern uint32_t g_nChromaSize;
// Prototypes (Public) ________________________________________________ // Prototypes (Public) ________________________________________________
extern void NTSC_SetVideoMode( int bVideoModeFlags ); extern void NTSC_SetVideoMode( uint32_t uVideoModeFlags );
extern void NTSC_SetVideoStyle(); extern void NTSC_SetVideoStyle();
extern void NTSC_SetVideoTextMode( int cols ); extern void NTSC_SetVideoTextMode( int cols );
extern uint32_t*NTSC_VideoGetChromaTable( bool bHueTypeMonochrome, bool bMonitorTypeColorTV ); extern uint32_t*NTSC_VideoGetChromaTable( bool bHueTypeMonochrome, bool bMonitorTypeColorTV );

2
source/Video.cpp
View File

@ -1193,7 +1193,7 @@ static void VideoFrameBufferAdjust(int& xSrc, int& ySrc, bool bInvertY=false)
ySrc += dy; ySrc += dy;
} }
void VideoRefreshScreen ( int uRedrawWholeScreenVideoMode /* =0*/, bool bRedrawWholeScreen /* =false*/ ) void VideoRefreshScreen ( uint32_t uRedrawWholeScreenVideoMode /* =0*/, bool bRedrawWholeScreen /* =false*/ )
{ {
#if defined(_DEBUG) && defined(DEBUG_REFRESH_TIMINGS) #if defined(_DEBUG) && defined(DEBUG_REFRESH_TIMINGS)
DebugRefresh(0); DebugRefresh(0);

2
source/Video.h
View File

@ -172,7 +172,7 @@ void VideoRealizePalette (HDC);
void VideoRedrawScreenDuringFullSpeed(DWORD dwCyclesThisFrame, bool bInit = false); void VideoRedrawScreenDuringFullSpeed(DWORD dwCyclesThisFrame, bool bInit = false);
void VideoRedrawScreenAfterFullSpeed(DWORD dwCyclesThisFrame); void VideoRedrawScreenAfterFullSpeed(DWORD dwCyclesThisFrame);
void VideoRedrawScreen (void); void VideoRedrawScreen (void);
void VideoRefreshScreen (int uRedrawWholeScreenVideoMode = 0, bool bRedrawWholeScreen = false); void VideoRefreshScreen (uint32_t uRedrawWholeScreenVideoMode = 0, bool bRedrawWholeScreen = false);
void VideoReinitialize (); void VideoReinitialize ();
void VideoResetState (); void VideoResetState ();
WORD VideoGetScannerAddress(bool* pbVblBar_OUT, const DWORD uExecutedCycles); WORD VideoGetScannerAddress(bool* pbVblBar_OUT, const DWORD uExecutedCycles);