Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 15:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Make Video.cpp and WinVideo.cpp into a dependent class hierarchy (PR #898)

Browse Source 
. class hierarchy: WinVideo IS_A Video (ie. WinVideo is a subclass of Video)
. GetVideo() singleton instance of WinVideo in AppleWin.cpp, exposed via Interface.h
This commit is contained in:
TomCh
2020-12-28 16:25:29 +00:00
committed by GitHub
parent 89bd685bd6
commit 3aa5750dcf
30 changed files with 691 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Disk.cpp
+3 -6
View File
@@ -42,7 +42,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Memory.h"
#include "Registry.h"
#include "SaveState.h"
#include "Video.h"
#include "YamlHelper.h"
#include "../resource/resource.h"
@@ -352,7 +351,7 @@ void Disk2InterfaceCard::EjectDisk(const int drive)
Snapshot_UpdatePath();
SaveLastDiskImage(drive);
Video_ResetScreenshotCounter("");
GetVideo().Video_ResetScreenshotCounter("");
}
void Disk2InterfaceCard::UnplugDrive(const int drive)
@@ -710,14 +709,14 @@ ImageError_e Disk2InterfaceCard::InsertDisk(const int drive, LPCTSTR pszImageFil
GetImageTitle(pszImageFilename, pFloppy->m_imagename, pFloppy->m_fullname);
Snapshot_UpdatePath();
Video_ResetScreenshotCounter(pFloppy->m_imagename);
GetVideo().Video_ResetScreenshotCounter(pFloppy->m_imagename);
if (g_nAppMode == MODE_LOGO)
InitFirmware(GetCxRomPeripheral());
}
else
{
Video_ResetScreenshotCounter("");
GetVideo().Video_ResetScreenshotCounter("");
}
SaveLastDiskImage(drive);
@@ -1577,8 +1576,6 @@ bool Disk2InterfaceCard::UserSelectNewDiskImage(const int drive, LPCSTR pszFilen
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_START_DIR), 1, directory, MAX_PATH, TEXT(""));
StringCbPrintf(title, 40, TEXT("Select Disk Image For Drive %d"), drive + 1);
_ASSERT(sizeof(OPENFILENAME) == sizeof(OPENFILENAME_NT4)); // Required for Win98/ME support (selected by _WIN32_WINNT=0x0400 in stdafx.h)
OPENFILENAME ofn;
memset(&ofn, 0, sizeof(OPENFILENAME));
ofn.lStructSize = sizeof(OPENFILENAME);