From c79abb45eba94609fb55e7f4cf24b2daba827312 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sat, 21 Nov 2020 21:13:21 +0000 Subject: [PATCH] Renamed DirectVideoInitialize/Destroy() to WinVideoInitialize/Destroy() --- source/AppleWin.cpp | 2 +- source/Frame.cpp | 2 +- source/Video.cpp | 2 +- source/Windows/WinVideo.cpp | 4 ++-- source/Windows/WinVideo.h | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/AppleWin.cpp b/source/AppleWin.cpp index 068f3f87..4cff67e3 100644 --- a/source/AppleWin.cpp +++ b/source/AppleWin.cpp @@ -2064,7 +2064,7 @@ static void RepeatInitialization(void) JoyInitialize(); LogFileOutput("Main: JoyInitialize()\n"); - DirectVideoInitialize(); // g_pFramebufferinfo been created now + WinVideoInitialize(); // g_pFramebufferinfo been created now LogFileOutput("Main: VideoInitialize()\n"); LogFileOutput("Main: FrameCreateWindow() - pre\n"); diff --git a/source/Frame.cpp b/source/Frame.cpp index 32e2aabb..c797903f 100644 --- a/source/Frame.cpp +++ b/source/Frame.cpp @@ -1162,7 +1162,7 @@ LRESULT CALLBACK FrameWndProc ( CpuDestroy(); MemDestroy(); SpkrDestroy(); - DirectVideoDestroy(); + WinVideoDestroy(); MB_Destroy(); DeleteGdiObjects(); DIMouse::DirectInputUninit(window); // NB. do before window is destroyed diff --git a/source/Video.cpp b/source/Video.cpp index 423d4846..4ab0475f 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -50,7 +50,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Globals (Public) - uint8_t *g_pFramebufferbits = NULL; // last drawn frame (initialized in DirectVideoInitialize) + uint8_t *g_pFramebufferbits = NULL; // last drawn frame (initialized in WinVideoInitialize) int g_nAltCharSetOffset = 0; // alternate character set // Globals (Private) diff --git a/source/Windows/WinVideo.cpp b/source/Windows/WinVideo.cpp index 172f21c3..6c1d875f 100644 --- a/source/Windows/WinVideo.cpp +++ b/source/Windows/WinVideo.cpp @@ -81,7 +81,7 @@ static void videoCreateDIBSection() // ----- ALL GLOBALLY ACCESSIBLE FUNCTIONS ARE BELOW THIS LINE ----- // -void DirectVideoInitialize() +void WinVideoInitialize() { // RESET THE VIDEO MODE SWITCHES AND THE CHARACTER SET OFFSET VideoResetState(); @@ -108,7 +108,7 @@ void DirectVideoInitialize() videoCreateDIBSection(); } -void DirectVideoDestroy() +void WinVideoDestroy() { // DESTROY BUFFERS diff --git a/source/Windows/WinVideo.h b/source/Windows/WinVideo.h index 0b7324ff..3f9820cd 100644 --- a/source/Windows/WinVideo.h +++ b/source/Windows/WinVideo.h @@ -2,8 +2,8 @@ // Prototypes _______________________________________________________ -void DirectVideoInitialize(); -void DirectVideoDestroy(); +void WinVideoInitialize(); +void WinVideoDestroy(); void VideoBenchmark (); void VideoChooseMonochromeColor (); // FIXME: Should be moved to PageConfig and call VideoSetMonochromeColor()