From d382cccffe33608b1156ddedee73475dfe90d0d4 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Fri, 11 Jul 2014 12:21:39 +0300 Subject: [PATCH] 2820b3 --- include/options.h | 2 +- od-win32/win32.cpp | 18 ++++---- od-win32/win32.h | 4 +- od-win32/win32gui.cpp | 2 +- od-win32/winuae_msvc11/winuae_msvc.vcxproj | 2 +- od-win32/winuaechangelog.txt | 50 ++++++++++++++++++++++ 6 files changed, 65 insertions(+), 13 deletions(-) diff --git a/include/options.h b/include/options.h index 2f522395..11c7e45c 100644 --- a/include/options.h +++ b/include/options.h @@ -176,7 +176,7 @@ struct uaedev_config_data int unitnum; // scsi unit number (if tape currently) }; -enum { CP_GENERIC = 1, CP_CDTV, CP_CD32, CP_CD32FMV, CP_A500, CP_A500P, CP_A600, CP_A1000, +enum { CP_GENERIC = 1, CP_CDTV, CP_CD32, CP_A500, CP_A500P, CP_A600, CP_A1000, CP_A1200, CP_A2000, CP_A3000, CP_A3000T, CP_A4000, CP_A4000T }; #define IDE_A600A1200 1 diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 74012d03..396fd72e 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -3059,15 +3059,17 @@ void target_fixup_options (struct uae_prefs *p) p->gfx_size_fs.special = 0; } /* switch from 32 to 16 or vice versa if mode does not exist */ - int depth = p->color_mode == 5 ? 4 : 2; - for (int i = 0; md->DisplayModes[i].depth >= 0; i++) { - if (md->DisplayModes[i].depth == depth) { - depth = 0; - break; + if (1 || isfullscreen() > 0) { + int depth = p->color_mode == 5 ? 4 : 2; + for (int i = 0; md->DisplayModes[i].depth >= 0; i++) { + if (md->DisplayModes[i].depth == depth) { + depth = 0; + break; + } + } + if (depth) { + p->color_mode = p->color_mode == 5 ? 2 : 5; } - } - if (depth) { - p->color_mode = p->color_mode == 5 ? 2 : 5; } if (p->rtg_hardwaresprite && !p->gfx_api) { error_log (_T("DirectDraw is not RTG hardware sprite compatible.")); diff --git a/od-win32/win32.h b/od-win32/win32.h index e2f1238d..9e66accd 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -20,12 +20,12 @@ #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("2") +#define WINUAEBETA _T("3") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2014, 7, 10) +#define WINUAEDATE MAKEBD(2014, 7, 11) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 0b3ee0a1..4f05bd5f 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -1450,7 +1450,7 @@ static int isromext (const TCHAR *path, bool deepscan) return 0; ext++; - if (!_tcsicmp (ext, _T("rom")) || !_tcsicmp (ext, _T("adf")) || !_tcsicmp (ext, _T("key")) + if (!_tcsicmp (ext, _T("rom")) || !_tcsicmp (ext, _T("bin")) || !_tcsicmp (ext, _T("adf")) || !_tcsicmp (ext, _T("key")) || !_tcsicmp (ext, _T("a500")) || !_tcsicmp (ext, _T("a1200")) || !_tcsicmp (ext, _T("a4000")) || !_tcsicmp (ext, _T("cd32"))) return 1; if (_tcslen (ext) >= 2 && toupper(ext[0]) == 'U' && isdigit (ext[1])) diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj b/od-win32/winuae_msvc11/winuae_msvc.vcxproj index bebd7529..591beec2 100644 --- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc11/winuae_msvc.vcxproj @@ -648,7 +648,7 @@ 0x0409 - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;avrt.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff;%(AdditionalDependencies) + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;avrt.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 25f7e0cb..96d0d017 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -18,6 +18,56 @@ Things that may happen in 2015: - restore only single input target to default. +Beta 3: + +- Selected chipset extra didn't match what dialog box shows (b2). This broke many configs.. +- CD32 FMV 16-bit display mode support. +- A590/A2091, A3000, A4000T and A4091 SCSI was not initialized unless at least one device was connected (b1). +- Added Picasso IV flash rom v7.4 image to rom scanner. It does not need to be called picasso_iv_flash.rom anymore. +- Added Blizzard 1230-IV and 1240/1260 Boot ROMs to rom scanner. (Coming soon Blizzard 1230/40/60 unique memory + layout and maprom emulation. It can be useful for developers and for testing without real board. This was + supposed to be implemented in this beta but chipset extra bug required quick update) +- .bin extension added to ROM scanner. + +Beta 2: + +- Pointless CD32 Full Motion Video cartridge emulation! (Check notes below) +- CD32 FMV 40.22 ROM image rom scanner checksum fixed (was from byteswapped image). ROM rescan required. +- Added CD32 FMV option to Expansion panel. +- Added CD32 FMV to ROM scanner result dialog. +- GamePorts panel autofire always-option crashed. +- CD image emulation didn't support 2336 to 2352 sector size conversion. +- CD image emulation didn't return correct data if image had 2 data tracks back to back and + tracks from second data track was requested. (Cannon Fodder CD32 FMV track) +- Debugger MOVES instruction's source and destination was swapped. +- Quickstart CD image selection text box become empty after image was selected (b1) +- RTG scale options didn't work on the fly. (2.8.0) + +CD32 FMV notes: + +- ROM requests won't be allowed and will be deleted. ("Find" it yourself or get AmigaForever or something) +- Only supports CL450 MPEG decoder commands that basic playback needs. +- VCD quality is not that good: MPEG-1 with 352x288 (PAL) or 352x240 (NTSC) resolution, MPEG-1 layer 2 audio. +- Requires at least null filter. (Automatically enabled) +- Requires 32-bit display mode, 16-bit will work in future. (Not automatically enabled) +- Tested with CD32 FMV 40.22 and 40.30 ROM versions. +- Tested only with Cannon Fodder CD32 video track and one VCD movie. +- Rewind or fast forward hangs the player software. (No idea why. No CL450 commands sent.) +- AV sync may not be that good. +- Sound buffer underflows will happen. +- CL450 video window size and position values ignored, video window is always centered and automatically + 1x/2x/4x scaled. +- Video is 1:1 pixel mapped, aspect ratio is ignored. +- Before reporting anything: make sure your Cannon Fodder CD32 image is correct. It must have 2 data + tracks, check .cue file using any text editor. Plain iso also can't work. +- Config must be based on "CD32 with Full Motion Video cartridge". Do not load old CD32 config and tick + CD32 FMV expansion option. If you do it, you are on your own. + +- Only obvious bugs (very jittery video, nothing happens etc..) will be accepted. + Everything else will be ignored until I get my own FMV cartridge. + I won't pay for it. Exception is getting enough donations. + WinUAE is not a video player! + Beta 1: - Debugger TR command didn't handle linked resident lists correctly (inverted mask..). -- 2.47.3