empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2399 commits 17 branches 15 tags 57 MiB
Commit graph

2399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrea Odetti
40b37ccccb Fix compilation error after merge. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-29 18:02:43 +00:00
Andrea Odetti
ab08dd7de7 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	source/CommonVICE/types.h
 2020-11-29 18:00:16 +00:00
tomcw
e2d7eb7406 Removed (the now) unused alarm.h 2020-11-29 17:39:52 +00:00
Andrea
7ca547479b
Move Windows related functions to Interface.h (PR #882) 
This is not complete as header files from Windows/.. are still included in:

Keyboard.cpp
SerialComms.cpp
Joystick.cpp

But probably these are arch specific and will have to be completely reimplemented elsewhere.
 2020-11-29 17:30:06 +00:00
Andrea
93346c215f
Cleanup types and include's to ease GCC compilation. (PR #881) 
. Do not include alarm.h as it is not needed.
The code in alarm.h is not complete: all the extern functions are missing and different linkers might complain about this.

. Do not redefine some windows.h types in VICE/types.h as it becomes harder to keep them consistent.
Biggest problem is DWORD_IS_LONG as the best way to define it in linux 64 bit is as an int. Prefer to use StdAfx.h.
 2020-11-29 17:22:50 +00:00
Andrea Odetti
600d6cf00e Print AW version in -h output. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-29 16:39:17 +00:00
Andrea Odetti
a5734cac10 Use GetAppleWindowTitle() from AW. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-29 16:37:45 +00:00
Andrea Odetti
1b6127dbb6 Merge remote-tracking branch 'upstream/master' 2020-11-29 16:36:05 +00:00
TomCh
5d90b64829
Use _stat64() to support file size >2G (PR #880) 2020-11-29 15:48:23 +00:00
Kelvin Lee
4c19069d8b Remove unnecessary conditional compile for _MSC_VER 2020-11-30 01:05:25 +11:00
TomCh
edadde74ab
Move GetAppleWindowTitle() to Utilities.cpp as it is generic. (PR #879) 2020-11-29 13:45:49 +00:00
Kelvin Lee
a7353aa7f1 Use _stat64() to support file size >2G 
1. Newer VC runtime stat(), when using 32-bit file size, returns error
   if file size is >2G. For file existence check, using 64-bit file
   size is more accurate as files bigger than 2G would be reported as
   non-existing otherwise.
2. <sys/stat.h> is required for VS2013 or before.
 2020-11-29 10:12:03 +11:00
Andrea Odetti
ed178d8b1c Move GetAppleWindowTitle() to Utilities.cpp as it is generic and useful to other archs. 2020-11-28 15:49:19 +00:00
Andrea Odetti
a0c3fcf416 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	source/RGBMonitor.cpp
 2020-11-28 14:17:24 +00:00
TomCh
391df5d4c0
Select a value of the Alpha mask that works at the same time in Windows and Linux (Qt / SDL). (PR #878) 
In Windows it does not seem to make any difference, so 0xFF is selected for maximum compatibility.
 2020-11-28 14:14:03 +00:00
Andrea Odetti
63e5c5c9ff Select a value of the Alpha mask that works at the same time in Windows and Linux (qt / sdl). 
In Windows it does not seem to make any difference, so 0xFF is selected for maximum compatibility.
 2020-11-28 14:13:20 +00:00
Andrea Odetti
312a618196 Merge remote-tracking branch 'upstream/master' 2020-11-28 10:02:11 +00:00
Andrea Odetti
338719d82b Make VideoBenchmark include the video redraw (without vsync). 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-28 10:01:49 +00:00
Andrea
3d70a9dd35
Some small changes to ensure code compiles with GCC. (PR #877) 2020-11-27 20:57:35 +00:00
Andrea Odetti
156d1421e0 Make sure alpha = 0xFF in all cases. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-27 18:55:35 +00:00
Andrea Odetti
9fabc71464 Use existing function VideoGetAppWindowTitle(). 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-27 18:55:07 +00:00
Andrea Odetti
8e6fc89384 From AW's master, AppleWin.cpp split. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-27 13:48:53 +00:00
Andrea Odetti
90368927e8 Merge remote-tracking branch 'upstream/master' 2020-11-27 08:55:05 +00:00
tomcw
8ef34d7d76 Fixed TestDebugger.cpp 2020-11-26 21:52:39 +00:00
Andrea
bbe88da787
AppleWin.cpp split (PR #875) 
. Split AppleWin -> Core with the functionality really needed by the emulator.
. Split AppleWin -> Utilities for generic code not called by other emulator components.
. Split AppleWin -> CmdLine for the command line option parsing.
 2020-11-26 21:50:06 +00:00
TomCh
6e166dfff6
Support NSC for Apple II/II+ via F8-ROM (#827 PR #873) 2020-11-25 21:57:34 +00:00
Andrea Odetti
9cd8b22647 Use Frame.cpp from upstream. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-24 07:51:50 +00:00
Andrea Odetti
97e219ac47 Merge remote-tracking branch 'upstream/master' 2020-11-24 07:41:15 +00:00
Andrea
c455488b50
Split Frame.cpp to WinFrame.cpp (PR #874) 2020-11-23 19:21:20 +00:00
Andrea Odetti
18dd63e7eb Add suppressions for valgrind. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-22 20:48:06 +00:00
Andrea Odetti
cadb72442a Use Video.cpp "as is". 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-22 09:36:28 +00:00
Andrea Odetti
78200c7a2c Merge remote-tracking branch 'upstream/master' 2020-11-22 08:44:52 +00:00
tomcw
c79abb45eb Renamed DirectVideoInitialize/Destroy() to WinVideoInitialize/Destroy() 2020-11-21 21:13:21 +00:00
Andrea Odetti
e2ea9c5f22 Marginally better benchmark calculation. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-21 21:01:34 +00:00
Andrea
2a7191f5ce
Split Video.cpp to WinVideo.cpp to remove most of the Win32 specific functions (PR #872) 
. Moved DirectInput.cpp/h and WinVideo.cpp/h to a new "Windows" folder.
 2020-11-21 20:57:56 +00:00
Andrea Odetti
e883e1b38c Add support for video benchmark. 
Screen repaint is not included (as it would force vsync), so it stops at the texture update.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-21 20:13:56 +00:00
tomcw
8fbf09d1c7 Fixed minor Coverity issue (CID 1446646) 2020-11-21 17:05:02 +00:00
Andrea Odetti
a121981e5a sa2: Add support for --headless and --fixed-speed. 
Headless will skip the video refresh (and the vsync).
Fixed-Speed will avoid adaptive speed.

Used together, the emulator will go at maximum speed skipping video refresh (useful for profiling).
 2020-11-21 15:07:31 +00:00
Andrea Odetti
7067ad150e sa2: Make window resizable. 
Ctrl-F6 will still loop between 1x ans 2x sizes.
 2020-11-21 09:42:46 +00:00
Andrea Odetti
b59e7605e9 sa2: add application icon. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-21 09:35:15 +00:00
Andrea Odetti
dec8b54a9e Write more accurate audio diagnostics. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-21 09:15:46 +00:00
Andrea Odetti
6d4dd11f06 Audio: remove useless workaround 1/3 1/4 and initial silence. 
Let AW's adaptive algorithm do it all.
Just be careful not writing too much to SDL as it would unsettle AW.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-20 20:23:10 +00:00
Andrea Odetti
48146f4c34 Keep track of actual speed to ensure emulated CPU goes at the right speed (and keeps audio on track). 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-20 15:32:35 +00:00
Andrea Odetti
ad335e2a5c Merge remote-tracking branch 'upstream/master' 2020-11-20 11:51:41 +00:00
tomcw
d6a2339ff0 Coverity SA: Fixed the 2 new Impact=High issues: 
. CID 1499553: UNINIT
. CID 1499560: OVERRUN (out of bounds access in CmdBookmarkAdd)
Fixed bug in CmdBookmarkClear() too.
 2020-11-17 21:31:57 +00:00
Andrea Odetti
7a9ed38326 Follow upstream capitalisation of AppleWin.cpp. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-15 15:44:06 +00:00
Andrea Odetti
31d87f5a9c Merge remote-tracking branch 'upstream/master' 2020-11-15 15:42:44 +00:00
Andrea Odetti
8c71b946b4 Prefer mean over average. 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
 2020-11-15 14:47:51 +00:00
Andrea Odetti
e58b547d59 Fix actual vs expected clock. 2020-11-14 20:42:27 +00:00
Andrea
0511128fea
Merge pull request #13 from audetto/threads 
Threads
 2020-11-14 20:36:14 +00:00