From 1ac0fc86575d758537f51d44e903cdb03ff42e84 Mon Sep 17 00:00:00 2001 From: tomcw Date: Thu, 15 Sep 2016 21:25:48 +0100 Subject: [PATCH 01/24] Tweaks to help about sound and (C) year bumped to 2016 --- help/sound.html | 12 ++++-------- resource/Applewin.rc | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/help/sound.html b/help/sound.html index 3638c700..b8a12792 100644 --- a/help/sound.html +++ b/help/sound.html @@ -10,16 +10,12 @@ Sound

Sound:

-

AppleWin emulates both the internal speaker (using the PC speaker or sound card) - and also the Mockingboard sound card (using a PC sound card).

+

AppleWin emulates both the internal speaker + and also the Mockingboard (or Phasor) sound card, using a PC sound card.

Use the AppleWin Configuration tab labelled Sound.

-

If you are using a sound card, then use at least DirectX-9.

+

If you want to use a sound card then use at least DirectX 9.

Speaker:

-

You can select PC speaker or sound card:

- +

You can now only emulate this with a sound card.

Mockingboard:

When the Mockingboards are enabled, the cards are physically plugged into slots 4 and 5 of the Apple II.

diff --git a/resource/Applewin.rc b/resource/Applewin.rc index d975644f..d679e30d 100644 --- a/resource/Applewin.rc +++ b/resource/Applewin.rc @@ -271,7 +271,7 @@ BEGIN VALUE "FileDescription", "Apple //e Emulator for Windows" VALUE "FileVersion", "1, 26, 0, 1" VALUE "InternalName", "APPLEWIN" - VALUE "LegalCopyright", " 1994-2015 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" + VALUE "LegalCopyright", " 1994-2016 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" VALUE "OriginalFilename", "APPLEWIN.EXE" VALUE "ProductName", "Apple //e Emulator" VALUE "ProductVersion", "1, 26, 0, 1" From 09fa6ccef54ea2479488853377dc3826e32e9d98 Mon Sep 17 00:00:00 2001 From: tomcw Date: Fri, 16 Sep 2016 23:05:39 +0100 Subject: [PATCH 02/24] Fixed #342 --- source/NTSC.cpp | 2 +- source/Video.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/NTSC.cpp b/source/NTSC.cpp index 09c19f9d..ce5538c6 100644 --- a/source/NTSC.cpp +++ b/source/NTSC.cpp @@ -1481,7 +1481,7 @@ void NTSC_SetVideoMode( int bVideoModeFlags ) g_nTextPage = 1; g_nHiresPage = 1; if (bVideoModeFlags & VF_PAGE2) { - // Apple IIe, Techical Nodtes, #3: Double High-Resolution Graphics + // Apple IIe, Technical Notes, #3: Double High-Resolution Graphics // 80STORE must be OFF to display page 2 if (0 == (bVideoModeFlags & VF_80STORE)) { g_nTextPage = 2; diff --git a/source/Video.cpp b/source/Video.cpp index 22d2bd15..4e555eb7 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -1168,9 +1168,10 @@ void VideoRefreshScreen ( int bVideoModeFlags, UINT uDelayRefresh /* =0 */ ) DebugRefresh(0); #endif - if( bVideoModeFlags ) + if (g_nAppMode == MODE_DEBUG || g_nAppMode == MODE_PAUSED) { - NTSC_SetVideoMode( bVideoModeFlags ); + if (g_nAppMode == MODE_DEBUG) + NTSC_SetVideoMode( bVideoModeFlags ); NTSC_VideoUpdateCycles( VIDEO_SCANNER_6502_CYCLES ); } From 41b2547acbdeed107041f9e87982122a04f91f05 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sat, 17 Sep 2016 10:04:32 +0100 Subject: [PATCH 03/24] Fix to get GR2 working, but #345 still not complete --- source/Debugger/Debug.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index 11215141..b14f7835 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -6515,7 +6515,7 @@ Update_t _ViewOutput( ViewVideoPage_t iPage, int bVideoModeFlags ) } Update_t CmdViewOutput_GR2 (int nArgs) { - return _ViewOutput( VIEW_PAGE_2, VF_80STORE ); // NTSC VideoRefresh() Hack: flags != 0 + return _ViewOutput( VIEW_PAGE_2, 0 ); } // Double Lo-Res Update_t CmdViewOutput_DGRX (int nArgs) From f559deddc36f9713dcd0ebb49b552bf3475add72 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sat, 17 Sep 2016 21:26:45 +0100 Subject: [PATCH 04/24] Fix for flickery/bad video updates when MODE_RUNNING and full-speed (broken in previous 09fa6cc) --- source/Video.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/Video.cpp b/source/Video.cpp index 4e555eb7..b38fdfa3 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -1168,9 +1168,12 @@ void VideoRefreshScreen ( int bVideoModeFlags, UINT uDelayRefresh /* =0 */ ) DebugRefresh(0); #endif - if (g_nAppMode == MODE_DEBUG || g_nAppMode == MODE_PAUSED) + if (bVideoModeFlags || g_nAppMode == MODE_PAUSED) { - if (g_nAppMode == MODE_DEBUG) + // bVideoModeFlags set if: + // . MODE_DEBUG : always + // . MODE_RUNNING : called from VideoRedrawScreen(), eg. during full-speed + if (bVideoModeFlags) NTSC_SetVideoMode( bVideoModeFlags ); NTSC_VideoUpdateCycles( VIDEO_SCANNER_6502_CYCLES ); } From 182567c8ed0e5c0b9dc8ab9005663561448bcdb9 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sat, 17 Sep 2016 21:35:49 +0100 Subject: [PATCH 05/24] History.txt: set today's date for release --- bin/History.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/History.txt b/bin/History.txt index c2b692e4..20cb5a9c 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -9,8 +9,8 @@ https://github.com/AppleWin/AppleWin/issues/new Tom Charlesworth -1.26.0.1 (beta) - 5 Sept 2016 ---------------------------- +1.26.0.1 (beta) - 17 Sept 2016 +------------------------------ Changes: . [Bug #126,#157,#194] Beta NTSC support TV Color, TV B&W, Monitor Color, Monitor B&W From 67bbbdbbe1d39fe73c66876ebe62378d051dfb58 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sat, 17 Sep 2016 21:53:42 +0100 Subject: [PATCH 06/24] History.txt: add pull-request changes from @pedgarcia --- bin/History.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/History.txt b/bin/History.txt index 20cb5a9c..480c03a5 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -25,6 +25,8 @@ Changes: . Added -load-state command line option . New repo created with test save-state images: https://github.com/AppleWin/AppleWin-Test . Remove unsupported PC speaker sound types +. [PR #235] New start-up title screen by Paulo Gracia +. [PR #233] Configuration Dialog->Disk tab: Buttons replaced with drop-down menu for select/eject by Paulo Gracia Fixes: . [Bug #129] Tight loop page-flipping causing heavy CPU load (fixed by NTSC / cycle-accurate video emulation) From 3dbc44dac5df93a4f7f76db258e6d67f96308de1 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sat, 17 Sep 2016 22:04:58 +0100 Subject: [PATCH 07/24] History.txt: fix typo in name --- bin/History.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/History.txt b/bin/History.txt index 480c03a5..a2cb8400 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -25,8 +25,8 @@ Changes: . Added -load-state command line option . New repo created with test save-state images: https://github.com/AppleWin/AppleWin-Test . Remove unsupported PC speaker sound types -. [PR #235] New start-up title screen by Paulo Gracia -. [PR #233] Configuration Dialog->Disk tab: Buttons replaced with drop-down menu for select/eject by Paulo Gracia +. [PR #235] New start-up title screen by Paulo Garcia +. [PR #233] Configuration Dialog->Disk tab: Buttons replaced with drop-down menu for select/eject by Paulo Garcia Fixes: . [Bug #129] Tight loop page-flipping causing heavy CPU load (fixed by NTSC / cycle-accurate video emulation) From 1d34497d2d6ee03f28df0aa569d4bad40463f5c4 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 18 Sep 2016 15:56:22 +0100 Subject: [PATCH 08/24] Speed-up booting AZTEC.DSK (#347) --- bin/History.txt | 2 +- resource/Applewin.rc | 8 ++++---- source/Applewin.cpp | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/History.txt b/bin/History.txt index a2cb8400..31f5da6a 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -9,7 +9,7 @@ https://github.com/AppleWin/AppleWin/issues/new Tom Charlesworth -1.26.0.1 (beta) - 17 Sept 2016 +1.26.0.2 (beta) - 18 Sept 2016 ------------------------------ Changes: . [Bug #126,#157,#194] Beta NTSC support diff --git a/resource/Applewin.rc b/resource/Applewin.rc index d679e30d..67573c3e 100644 --- a/resource/Applewin.rc +++ b/resource/Applewin.rc @@ -250,8 +250,8 @@ DISK_ICON ICON "DISK.ICO" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,26,0,1 - PRODUCTVERSION 1,26,0,1 + FILEVERSION 1,26,0,2 + PRODUCTVERSION 1,26,0,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -269,12 +269,12 @@ BEGIN VALUE "Comments", "https://github.com/AppleWin" VALUE "CompanyName", "AppleWin" VALUE "FileDescription", "Apple //e Emulator for Windows" - VALUE "FileVersion", "1, 26, 0, 1" + VALUE "FileVersion", "1, 26, 0, 2" VALUE "InternalName", "APPLEWIN" VALUE "LegalCopyright", " 1994-2016 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" VALUE "OriginalFilename", "APPLEWIN.EXE" VALUE "ProductName", "Apple //e Emulator" - VALUE "ProductVersion", "1, 26, 0, 1" + VALUE "ProductVersion", "1, 26, 0, 2" END END BLOCK "VarFileInfo" diff --git a/source/Applewin.cpp b/source/Applewin.cpp index 3b8aef53..9a1b779d 100644 --- a/source/Applewin.cpp +++ b/source/Applewin.cpp @@ -284,11 +284,10 @@ void ContinueExecution(void) g_dwCyclesThisFrame -= dwClksPerFrame; if (g_bFullSpeed) - { VideoRedrawScreenDuringFullSpeed(g_dwCyclesThisFrame); - } + else + VideoRefreshScreen(0); // Just copy the output of our Apple framebuffer to the system Back Buffer - VideoRefreshScreen(0); // Just copy the output of our Apple framebuffer to the system Back Buffer MB_EndOfVideoFrame(); } From 67d5b28b80cfbcb6730980b3922c7b72c32ad299 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 18 Sep 2016 17:54:38 +0100 Subject: [PATCH 09/24] Fixed #346 (Config->Disk tab) --- help/cfg-disk.html | 14 +++++++------- help/img/disk.png | Bin 37720 -> 34265 bytes 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/help/cfg-disk.html b/help/cfg-disk.html index 29b34f1b..efd6bea8 100644 --- a/help/cfg-disk.html +++ b/help/cfg-disk.html @@ -29,12 +29,11 @@ properly. This is the speed at which the real hardware would access data from your drives.

-

Select Disk 1/2:
+

Disk 1/2 drop-down menus:
- -These buttons allow you to select floppy disk images (.dsk files) to +These menus allow you to select floppy disk images (.dsk files) to 'insert' into the -emulated floppy drives 1 and 2.  This can also be done during emulation by using the toolbar or using the F3/F4 keys. Diskettes can be swapped by pressing F5 during emulation.

+emulated floppy drives 1 and 2. This can also be done during emulation by using the toolbar or using the F3/F4 keys. Diskettes can be swapped by pressing F5 during emulation. You can also eject images from this menu.

Harddisk Controller Settings:

@@ -50,11 +49,12 @@ floppy disk with the harddisk card enabled, you can issue PR#6 from an AppleSoft prompt.

You can download sample .hdv images from Asimov (eg. ftp://public.asimov.net/pub/apple_II/images/utility/misc/hardpc.zip).

-

Select HDD1/HDD2:
+

HDD 1/2 drop-down menus:
+ +These menus allow you to select harddisk images (.hdv files) to +connect to the emulated hard drive controller. You can also unplug images from this menu.

-These buttons allow you to select harddisk images (.hdv files) to -connect to the emulated hard drive controller.

Harddisk warnings: