From 3a408cba147860326c0df4254d7af4d2e008909d Mon Sep 17 00:00:00 2001 From: Dirk Hoffmann Date: Mon, 1 Jul 2024 15:18:07 +0200 Subject: [PATCH] This is vAmiga 2.6.2 --- Emulator/Base/Defaults.cpp | 26 +++++++++---------- Emulator/Misc/RetroShell/CommandConsole.cpp | 2 +- Emulator/config.h | 2 +- GUI/Defaults.swift | 16 ++++++------ .../Configuration/CompatibilityConf.swift | 4 +-- vAmiga.xcodeproj/project.pbxproj | 8 +++--- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Emulator/Base/Defaults.cpp b/Emulator/Base/Defaults.cpp index 068a9c6c4..8dcdc1979 100644 --- a/Emulator/Base/Defaults.cpp +++ b/Emulator/Base/Defaults.cpp @@ -131,19 +131,19 @@ Defaults::Defaults() setFallback(OPT_JOY_AUTOFIRE, false, { 0, 1} ); setFallback(OPT_JOY_AUTOFIRE_BULLETS, -3, { 0, 1} ); setFallback(OPT_JOY_AUTOFIRE_DELAY, 125, { 0, 1} ); - setFallback(OPT_AUD_SAMPLING_METHOD, SMP_NONE, { 0, 1} ); - setFallback(OPT_AUD_FILTER_TYPE, FILTER_A500, { 0, 1} ); - setFallback(OPT_AUD_PAN0, 50, { 0, 1} ); - setFallback(OPT_AUD_PAN1, 350, { 0, 1} ); - setFallback(OPT_AUD_PAN2, 350, { 0, 1} ); - setFallback(OPT_AUD_PAN3, 50, { 0, 1} ); - setFallback(OPT_AUD_VOL0, 100, { 0, 1} ); - setFallback(OPT_AUD_VOL1, 100, { 0, 1} ); - setFallback(OPT_AUD_VOL2, 100, { 0, 1} ); - setFallback(OPT_AUD_VOL3, 100, { 0, 1} ); - setFallback(OPT_AUD_VOLL, 50, { 0, 1} ); - setFallback(OPT_AUD_VOLR, 50, { 0, 1} ); - setFallback(OPT_AUD_FASTPATH, true, { 0, 1} ); + setFallback(OPT_AUD_SAMPLING_METHOD, SMP_NONE); + setFallback(OPT_AUD_FILTER_TYPE, FILTER_A500); + setFallback(OPT_AUD_PAN0, 50); + setFallback(OPT_AUD_PAN1, 350); + setFallback(OPT_AUD_PAN2, 350); + setFallback(OPT_AUD_PAN3, 50); + setFallback(OPT_AUD_VOL0, 100); + setFallback(OPT_AUD_VOL1, 100); + setFallback(OPT_AUD_VOL2, 100); + setFallback(OPT_AUD_VOL3, 100); + setFallback(OPT_AUD_VOLL, 50); + setFallback(OPT_AUD_VOLR, 50); + setFallback(OPT_AUD_FASTPATH, true); setFallback(OPT_DIAG_BOARD, false); setFallback(OPT_SRV_PORT, 8080, { SERVER_SER }); setFallback(OPT_SRV_PROTOCOL, SRVPROT_DEFAULT, { SERVER_SER }); diff --git a/Emulator/Misc/RetroShell/CommandConsole.cpp b/Emulator/Misc/RetroShell/CommandConsole.cpp index e1c431cfb..b697898f3 100644 --- a/Emulator/Misc/RetroShell/CommandConsole.cpp +++ b/Emulator/Misc/RetroShell/CommandConsole.cpp @@ -265,7 +265,7 @@ CommandConsole::initCommands(Command &root) "Displays the user defaults storage", [this](Arguments& argv, long value) { - dump(amiga, Category::Defaults); + dump(emulator, Category::Defaults); }); initSetters(root, amiga); diff --git a/Emulator/config.h b/Emulator/config.h index a085f424e..398693d44 100644 --- a/Emulator/config.h +++ b/Emulator/config.h @@ -16,7 +16,7 @@ // Version number #define VER_MAJOR 2 #define VER_MINOR 6 -#define VER_SUBMINOR 1 +#define VER_SUBMINOR 2 #define VER_BETA 0 // Snapshot version number diff --git a/GUI/Defaults.swift b/GUI/Defaults.swift index 209898fb6..1251a2de3 100644 --- a/GUI/Defaults.swift +++ b/GUI/Defaults.swift @@ -729,7 +729,7 @@ extension DefaultsProxy { remove(.CPU_OVERCLOCKING) remove(.AGNUS_REVISION) remove(.DENISE_REVISION) - remove(.CIA_REVISION) + remove(.CIA_REVISION, [0, 1]) remove(.RTC_MODEL) } } @@ -766,7 +766,7 @@ extension Configuration { defaults.set(.CPU_OVERCLOCKING, cpuSpeed) defaults.set(.AGNUS_REVISION, agnusRev) defaults.set(.DENISE_REVISION, deniseRev) - defaults.set(.CIA_REVISION, ciaRev) + defaults.set(.CIA_REVISION, [0,1], ciaRev) defaults.set(.RTC_MODEL, rtClock) defaults.save() @@ -995,7 +995,7 @@ extension DefaultsProxy { remove(.DENISE_CLX_SPR_PLF) remove(.DENISE_CLX_PLF_PLF) remove(.DENISE_FRAME_SKIPPING) - remove(.CIA_IDLE_SLEEP) + remove(.CIA_IDLE_SLEEP, [0, 1]) remove(.AUD_FASTPATH) } } @@ -1038,7 +1038,7 @@ extension Configuration { defaults.set(.DENISE_CLX_SPR_PLF, clxSprPlf) defaults.set(.DENISE_CLX_PLF_PLF, clxPlfPlf) defaults.set(.DENISE_FRAME_SKIPPING, frameSkipping) - defaults.set(.CIA_IDLE_SLEEP, ciaIdleSleep) + defaults.set(.CIA_IDLE_SLEEP, [0,1], ciaIdleSleep) defaults.set(.AUD_FASTPATH, audioFastPath) defaults.save() @@ -1063,8 +1063,8 @@ extension DefaultsProxy { debug(.defaults) remove(.BLITTER_ACCURACY) - remove(.CIA_TODBUG) - remove(.CIA_ECLOCK_SYNCING) + remove(.CIA_TODBUG, [0, 1]) + remove(.CIA_ECLOCK_SYNCING, [0, 1]) remove(.DC_SPEED) remove(.DC_LOCK_DSKSYNC) remove(.DC_AUTO_DSKSYNC) @@ -1083,8 +1083,8 @@ extension Configuration { amiga.suspend() defaults.set(.BLITTER_ACCURACY, blitterAccuracy) - defaults.set(.CIA_TODBUG, todBug) - defaults.set(.CIA_ECLOCK_SYNCING, eClockSyncing) + defaults.set(.CIA_TODBUG, [0,1], todBug) + defaults.set(.CIA_ECLOCK_SYNCING, [0,1], eClockSyncing) defaults.set(.DC_SPEED, driveSpeed) defaults.set(.DC_LOCK_DSKSYNC, lockDskSync) defaults.set(.DC_AUTO_DSKSYNC, autoDskSync) diff --git a/GUI/Dialogs/Configuration/CompatibilityConf.swift b/GUI/Dialogs/Configuration/CompatibilityConf.swift index 02c75cf99..9b812bdda 100644 --- a/GUI/Dialogs/Configuration/CompatibilityConf.swift +++ b/GUI/Dialogs/Configuration/CompatibilityConf.swift @@ -133,8 +133,8 @@ extension ConfigurationController { defaults.set(.DC_SPEED, -1) defaults.set(.DRIVE_MECHANICS, [0, 1, 2, 3], 1) defaults.set(.KBD_ACCURACY, false) - defaults.set(.CIA_ECLOCK_SYNCING, false) - + defaults.set(.CIA_ECLOCK_SYNCING, [0, 1], false) + default: fatalError() } diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj index fd42e65ae..db7919f8b 100644 --- a/vAmiga.xcodeproj/project.pbxproj +++ b/vAmiga.xcodeproj/project.pbxproj @@ -2794,7 +2794,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 240628; + CURRENT_PROJECT_VERSION = 240701; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = NO; @@ -2815,7 +2815,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 2.6.1; + MARKETING_VERSION = 2.6.2; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20"; PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2844,7 +2844,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 240628; + CURRENT_PROJECT_VERSION = 240701; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = NO; @@ -2863,7 +2863,7 @@ ); LLVM_LTO = YES_THIN; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 2.6.1; + MARKETING_VERSION = 2.6.2; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20"; PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga; PRODUCT_NAME = "$(TARGET_NAME)";