Skip to content

Commit

Permalink
This is vAmiga 2.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@dirkwhoffmann
dirkwhoffmann committed Jul 1, 2024
1 parent 1e6baa1 commit 3a408cb
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
26 changes: 13 additions & 13 deletions Emulator/Base/Defaults.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
2 changes: 1 addition & 1 deletion Emulator/Misc/RetroShell/CommandConsole.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Emulator/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions GUI/Defaults.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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()

Expand All @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions GUI/Dialogs/Configuration/CompatibilityConf.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
8 changes: 4 additions & 4 deletions vAmiga.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)";
Expand Down Expand Up @@ -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;
Expand All @@ -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)";
Expand Down

0 comments on commit 3a408cb

Please sign in to comment.