diff --git a/AppleWinExpress2008.vcproj b/AppleWinExpress2008.vcproj index 560775d5..2a3c25dc 100644 --- a/AppleWinExpress2008.vcproj +++ b/AppleWinExpress2008.vcproj @@ -933,14 +933,6 @@ - - - - diff --git a/AppleWinExpress2019.vcxproj b/AppleWinExpress2019.vcxproj index 09c5dca1..7fd9b429 100644 --- a/AppleWinExpress2019.vcxproj +++ b/AppleWinExpress2019.vcxproj @@ -77,7 +77,6 @@ - @@ -176,7 +175,6 @@ - diff --git a/AppleWinExpress2019.vcxproj.filters b/AppleWinExpress2019.vcxproj.filters index a6025946..8a06c6c0 100644 --- a/AppleWinExpress2019.vcxproj.filters +++ b/AppleWinExpress2019.vcxproj.filters @@ -49,9 +49,6 @@ Source Files\Debugger - - Source Files\Video - Source Files\Disk @@ -297,9 +294,6 @@ Source Files\Debugger - - Source Files\Video - Source Files\Disk diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp index 8dd670db..46f26f69 100644 --- a/source/Debugger/Debugger_Display.cpp +++ b/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" diff --git a/source/Frame.cpp b/source/Frame.cpp deleted file mode 100644 index e4d94d7f..00000000 --- a/source/Frame.cpp +++ /dev/null @@ -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(); -} diff --git a/source/Frame.h b/source/Frame.h deleted file mode 100644 index 0e37a53b..00000000 --- a/source/Frame.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - - UINT GetFrameBufferBorderlessWidth(void); - UINT GetFrameBufferBorderlessHeight(void); - UINT GetFrameBufferBorderWidth(void); - UINT GetFrameBufferBorderHeight(void); - UINT GetFrameBufferWidth(void); - UINT GetFrameBufferHeight(void); diff --git a/source/NTSC.cpp b/source/NTSC.cpp index 7e7a7791..1fdc0f78 100644 --- a/source/NTSC.cpp +++ b/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" diff --git a/source/RGBMonitor.cpp b/source/RGBMonitor.cpp index 8a23bd3b..34ceeaa2 100644 --- a/source/RGBMonitor.cpp +++ b/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" diff --git a/source/Video.cpp b/source/Video.cpp index dee05601..d30d620a 100644 --- a/source/Video.cpp +++ b/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 ); diff --git a/source/Video.h b/source/Video.h index 69027f86..f09fa528 100644 --- a/source/Video.h +++ b/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}; diff --git a/source/Windows/WinFrame.cpp b/source/Windows/WinFrame.cpp index db841d72..81e80a20 100644 --- a/source/Windows/WinFrame.cpp +++ b/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" diff --git a/source/Windows/WinVideo.cpp b/source/Windows/WinVideo.cpp index 9787e680..3615b66e 100644 --- a/source/Windows/WinVideo.cpp +++ b/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"