Frame.h: merge into Video.h. (PR #896)

. The functions GetFrameBufferXXX() have been moved next to g_pFramebufferbits.

AppleWinExpress2008.vcproj

@@ -933,14 +933,6 @@
 			<Filter
 				Name="Video"
 				>
-				<File
-					RelativePath=".\source\Frame.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\source\Frame.h"
-					>
-				</File>
 				<File
 					RelativePath=".\source\NTSC.cpp"
 					>

AppleWinExpress2019.vcxproj

@@ -77,7 +77,6 @@
     <ClInclude Include="source\DiskImage.h" />
     <ClInclude Include="source\DiskImageHelper.h" />
     <ClInclude Include="source\DiskLog.h" />
-    <ClInclude Include="source\Frame.h" />
     <ClInclude Include="source\FrameBase.h" />
     <ClInclude Include="source\Harddisk.h" />
     <ClInclude Include="source\Interface.h" />
@@ -176,7 +175,6 @@
     <ClCompile Include="source\DiskFormatTrack.cpp" />
     <ClCompile Include="source\DiskImage.cpp" />
     <ClCompile Include="source\DiskImageHelper.cpp" />
-    <ClCompile Include="source\Frame.cpp" />
     <ClCompile Include="source\Harddisk.cpp" />
     <ClCompile Include="source\Joystick.cpp" />
     <ClCompile Include="source\Keyboard.cpp" />

AppleWinExpress2019.vcxproj.filters

@@ -49,9 +49,6 @@
     <ClCompile Include="source\Debugger\Debugger_Symbols.cpp">
       <Filter>Source Files\Debugger</Filter>
     </ClCompile>
-    <ClCompile Include="source\Frame.cpp">
-      <Filter>Source Files\Video</Filter>
-    </ClCompile>
     <ClCompile Include="source\Disk.cpp">
       <Filter>Source Files\Disk</Filter>
     </ClCompile>
@@ -297,9 +294,6 @@
     <ClInclude Include="source\Debugger\Debugger_Symbols.h">
       <Filter>Source Files\Debugger</Filter>
     </ClInclude>
-    <ClInclude Include="source\Frame.h">
-      <Filter>Source Files\Video</Filter>
-    </ClInclude>
     <ClInclude Include="source\Disk.h">
       <Filter>Source Files\Disk</Filter>
     </ClInclude>

source/Debugger/Debugger_Display.cpp

@@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "../Core.h"
 #include "../Interface.h"
 #include "../CPU.h"
-#include "../Frame.h"
 #include "../Windows/WinFrame.h"
 #include "../LanguageCard.h"
 #include "../Memory.h"

source/Frame.cpp

@@ -1,66 +0,0 @@
-/*
-AppleWin : An Apple //e emulator for Windows
-
-Copyright (C) 1994-1996, Michael O'Brien
-Copyright (C) 1999-2001, Oliver Schmidt
-Copyright (C) 2002-2005, Tom Charlesworth
-Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski
-
-AppleWin is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-AppleWin is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with AppleWin; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/* Description: Frame
- *
- * Author: Various
- */
-
-#include "StdAfx.h"
-
-#include "Frame.h"
-
-UINT GetFrameBufferBorderlessWidth(void)
-{
-	static const UINT uFrameBufferBorderlessW = 560;	// 560 = Double Hi-Res
-	return uFrameBufferBorderlessW;
-}
-
-UINT GetFrameBufferBorderlessHeight(void)
-{
-	static const UINT uFrameBufferBorderlessH = 384;	// 384 = Double Scan Line
-	return uFrameBufferBorderlessH;
-}
-
-// NB. These border areas are not visible (... and these border areas are unrelated to the 3D border below)
-UINT GetFrameBufferBorderWidth(void)
-{
-	static const UINT uBorderW = 20;
-	return uBorderW;
-}
-
-UINT GetFrameBufferBorderHeight(void)
-{
-	static const UINT uBorderH = 18;
-	return uBorderH;
-}
-
-UINT GetFrameBufferWidth(void)
-{
-	return GetFrameBufferBorderlessWidth() + 2*GetFrameBufferBorderWidth();
-}
-
-UINT GetFrameBufferHeight(void)
-{
-	return GetFrameBufferBorderlessHeight() + 2*GetFrameBufferBorderHeight();
-}

source/Frame.h

@@ -1,8 +0,0 @@
-#pragma once
-
-	UINT GetFrameBufferBorderlessWidth(void);
-	UINT GetFrameBufferBorderlessHeight(void);
-	UINT GetFrameBufferBorderWidth(void);
-	UINT GetFrameBufferBorderHeight(void);
-	UINT GetFrameBufferWidth(void);
-	UINT GetFrameBufferHeight(void);

source/NTSC.cpp

@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	#include "NTSC.h"
 	#include "Core.h"
 	#include "CPU.h"	// CpuGetCyclesThisVideoFrame()
-	#include "Frame.h"
 	#include "Memory.h" // MemGetMainPtr(), MemGetAuxPtr(), MemGetAnnunciator()
 	#include "Video.h"  // g_pFramebufferbits
 	#include "RGBMonitor.h"

source/RGBMonitor.cpp

@@ -3,7 +3,6 @@
 #include "StdAfx.h"
 
 #include "RGBMonitor.h"
-#include "Frame.h"
 #include "Memory.h" // MemGetMainPtr() MemGetAuxPtr()
 #include "Video.h"
 #include "Card.h"

source/Video.cpp

@@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Video.h"
 #include "Core.h"
 #include "CPU.h"
-#include "Frame.h"
 #include "Interface.h"
 #include "Log.h"
 #include "Memory.h"
@@ -128,7 +127,43 @@ static bool g_bVideoScannerNTSC = true;  // NTSC video scanning (or PAL)
 // ----- ALL GLOBALLY ACCESSIBLE FUNCTIONS ARE BELOW THIS LINE -----
 //
 
+UINT GetFrameBufferBorderlessWidth(void)
+{
+	static const UINT uFrameBufferBorderlessW = 560;	// 560 = Double Hi-Res
+	return uFrameBufferBorderlessW;
+}
+
+UINT GetFrameBufferBorderlessHeight(void)
+{
+	static const UINT uFrameBufferBorderlessH = 384;	// 384 = Double Scan Line
+	return uFrameBufferBorderlessH;
+}
+
+// NB. These border areas are not visible (... and these border areas are unrelated to the 3D border below)
+UINT GetFrameBufferBorderWidth(void)
+{
+	static const UINT uBorderW = 20;
+	return uBorderW;
+}
+
+UINT GetFrameBufferBorderHeight(void)
+{
+	static const UINT uBorderH = 18;
+	return uBorderH;
+}
+
+UINT GetFrameBufferWidth(void)
+{
+	return GetFrameBufferBorderlessWidth() + 2 * GetFrameBufferBorderWidth();
+}
+
+UINT GetFrameBufferHeight(void)
+{
+	return GetFrameBufferBorderlessHeight() + 2 * GetFrameBufferBorderHeight();
+}
+
 //===========================================================================
+
 void VideoReinitialize (bool bInitVideoScannerAddress /*= true*/)
 {
 	NTSC_VideoReinitialize( g_dwCyclesThisFrame, bInitVideoScannerAddress );

source/Video.h

@@ -185,6 +185,14 @@ extern uint8_t   *g_pFramebufferbits;
 
 // Prototypes _______________________________________________________
 
+// size of the video buffer stored in g_pFramebufferbits
+UINT GetFrameBufferBorderlessWidth(void);
+UINT GetFrameBufferBorderlessHeight(void);
+UINT GetFrameBufferBorderWidth(void);
+UINT GetFrameBufferBorderHeight(void);
+UINT GetFrameBufferWidth(void);
+UINT GetFrameBufferHeight(void);
+
 void    VideoReinitialize (bool bInitVideoScannerAddress = true);
 void    VideoResetState ();
 enum VideoScanner_e {VS_FullAddr, VS_PartialAddrV, VS_PartialAddrH};

source/Windows/WinFrame.cpp

@@ -45,7 +45,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "SerialComms.h"
 #include "SoundCore.h"
 #include "Speaker.h"
-#include "Frame.h"
 #include "Utilities.h"
 #include "Windows/WinVideo.h"
 #include "../resource/resource.h"

source/Windows/WinVideo.cpp

@@ -37,7 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Core.h"
 #include "CPU.h"
 #include "Joystick.h"
-#include "Frame.h"
 #include "Log.h"
 #include "Memory.h"
 #include "CardManager.h"