Skip to content

Commit 3a408cb

Browse files
dirkwhoffmanndirkwhoffmann
committed
This is vAmiga 2.6.2
1 parent 1e6baa1 commit 3a408cb

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

‎Emulator/Base/Defaults.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,19 @@ Defaults::Defaults()
131131
setFallback(OPT_JOY_AUTOFIRE, false, { 0, 1} );
132132
setFallback(OPT_JOY_AUTOFIRE_BULLETS, -3, { 0, 1} );
133133
setFallback(OPT_JOY_AUTOFIRE_DELAY, 125, { 0, 1} );
134-
setFallback(OPT_AUD_SAMPLING_METHOD, SMP_NONE, { 0, 1} );
135-
setFallback(OPT_AUD_FILTER_TYPE, FILTER_A500, { 0, 1} );
136-
setFallback(OPT_AUD_PAN0, 50, { 0, 1} );
137-
setFallback(OPT_AUD_PAN1, 350, { 0, 1} );
138-
setFallback(OPT_AUD_PAN2, 350, { 0, 1} );
139-
setFallback(OPT_AUD_PAN3, 50, { 0, 1} );
140-
setFallback(OPT_AUD_VOL0, 100, { 0, 1} );
141-
setFallback(OPT_AUD_VOL1, 100, { 0, 1} );
142-
setFallback(OPT_AUD_VOL2, 100, { 0, 1} );
143-
setFallback(OPT_AUD_VOL3, 100, { 0, 1} );
144-
setFallback(OPT_AUD_VOLL, 50, { 0, 1} );
145-
setFallback(OPT_AUD_VOLR, 50, { 0, 1} );
146-
setFallback(OPT_AUD_FASTPATH, true, { 0, 1} );
134+
setFallback(OPT_AUD_SAMPLING_METHOD, SMP_NONE);
135+
setFallback(OPT_AUD_FILTER_TYPE, FILTER_A500);
136+
setFallback(OPT_AUD_PAN0, 50);
137+
setFallback(OPT_AUD_PAN1, 350);
138+
setFallback(OPT_AUD_PAN2, 350);
139+
setFallback(OPT_AUD_PAN3, 50);
140+
setFallback(OPT_AUD_VOL0, 100);
141+
setFallback(OPT_AUD_VOL1, 100);
142+
setFallback(OPT_AUD_VOL2, 100);
143+
setFallback(OPT_AUD_VOL3, 100);
144+
setFallback(OPT_AUD_VOLL, 50);
145+
setFallback(OPT_AUD_VOLR, 50);
146+
setFallback(OPT_AUD_FASTPATH, true);
147147
setFallback(OPT_DIAG_BOARD, false);
148148
setFallback(OPT_SRV_PORT, 8080, { SERVER_SER });
149149
setFallback(OPT_SRV_PROTOCOL, SRVPROT_DEFAULT, { SERVER_SER });

‎Emulator/Misc/RetroShell/CommandConsole.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ CommandConsole::initCommands(Command &root)
265265
"Displays the user defaults storage",
266266
[this](Arguments& argv, long value) {
267267

268-
dump(amiga, Category::Defaults);
268+
dump(emulator, Category::Defaults);
269269
});
270270

271271
initSetters(root, amiga);

‎Emulator/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Version number
1717
#define VER_MAJOR 2
1818
#define VER_MINOR 6
19-
#define VER_SUBMINOR 1
19+
#define VER_SUBMINOR 2
2020
#define VER_BETA 0
2121

2222
// Snapshot version number

‎GUI/Defaults.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ extension DefaultsProxy {
729729
remove(.CPU_OVERCLOCKING)
730730
remove(.AGNUS_REVISION)
731731
remove(.DENISE_REVISION)
732-
remove(.CIA_REVISION)
732+
remove(.CIA_REVISION, [0, 1])
733733
remove(.RTC_MODEL)
734734
}
735735
}
@@ -766,7 +766,7 @@ extension Configuration {
766766
defaults.set(.CPU_OVERCLOCKING, cpuSpeed)
767767
defaults.set(.AGNUS_REVISION, agnusRev)
768768
defaults.set(.DENISE_REVISION, deniseRev)
769-
defaults.set(.CIA_REVISION, ciaRev)
769+
defaults.set(.CIA_REVISION, [0,1], ciaRev)
770770
defaults.set(.RTC_MODEL, rtClock)
771771
defaults.save()
772772

@@ -995,7 +995,7 @@ extension DefaultsProxy {
995995
remove(.DENISE_CLX_SPR_PLF)
996996
remove(.DENISE_CLX_PLF_PLF)
997997
remove(.DENISE_FRAME_SKIPPING)
998-
remove(.CIA_IDLE_SLEEP)
998+
remove(.CIA_IDLE_SLEEP, [0, 1])
999999
remove(.AUD_FASTPATH)
10001000
}
10011001
}
@@ -1038,7 +1038,7 @@ extension Configuration {
10381038
defaults.set(.DENISE_CLX_SPR_PLF, clxSprPlf)
10391039
defaults.set(.DENISE_CLX_PLF_PLF, clxPlfPlf)
10401040
defaults.set(.DENISE_FRAME_SKIPPING, frameSkipping)
1041-
defaults.set(.CIA_IDLE_SLEEP, ciaIdleSleep)
1041+
defaults.set(.CIA_IDLE_SLEEP, [0,1], ciaIdleSleep)
10421042
defaults.set(.AUD_FASTPATH, audioFastPath)
10431043
defaults.save()
10441044

@@ -1063,8 +1063,8 @@ extension DefaultsProxy {
10631063
debug(.defaults)
10641064

10651065
remove(.BLITTER_ACCURACY)
1066-
remove(.CIA_TODBUG)
1067-
remove(.CIA_ECLOCK_SYNCING)
1066+
remove(.CIA_TODBUG, [0, 1])
1067+
remove(.CIA_ECLOCK_SYNCING, [0, 1])
10681068
remove(.DC_SPEED)
10691069
remove(.DC_LOCK_DSKSYNC)
10701070
remove(.DC_AUTO_DSKSYNC)
@@ -1083,8 +1083,8 @@ extension Configuration {
10831083
amiga.suspend()
10841084

10851085
defaults.set(.BLITTER_ACCURACY, blitterAccuracy)
1086-
defaults.set(.CIA_TODBUG, todBug)
1087-
defaults.set(.CIA_ECLOCK_SYNCING, eClockSyncing)
1086+
defaults.set(.CIA_TODBUG, [0,1], todBug)
1087+
defaults.set(.CIA_ECLOCK_SYNCING, [0,1], eClockSyncing)
10881088
defaults.set(.DC_SPEED, driveSpeed)
10891089
defaults.set(.DC_LOCK_DSKSYNC, lockDskSync)
10901090
defaults.set(.DC_AUTO_DSKSYNC, autoDskSync)

‎GUI/Dialogs/Configuration/CompatibilityConf.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ extension ConfigurationController {
133133
defaults.set(.DC_SPEED, -1)
134134
defaults.set(.DRIVE_MECHANICS, [0, 1, 2, 3], 1)
135135
defaults.set(.KBD_ACCURACY, false)
136-
defaults.set(.CIA_ECLOCK_SYNCING, false)
137-
136+
defaults.set(.CIA_ECLOCK_SYNCING, [0, 1], false)
137+
138138
default:
139139
fatalError()
140140
}

‎vAmiga.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2794,7 +2794,7 @@
27942794
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
27952795
CODE_SIGN_STYLE = Manual;
27962796
COMBINE_HIDPI_IMAGES = YES;
2797-
CURRENT_PROJECT_VERSION = 240628;
2797+
CURRENT_PROJECT_VERSION = 240701;
27982798
DEAD_CODE_STRIPPING = YES;
27992799
DEVELOPMENT_TEAM = "";
28002800
ENABLE_APP_SANDBOX = NO;
@@ -2815,7 +2815,7 @@
28152815
"@executable_path/../Frameworks",
28162816
);
28172817
MACOSX_DEPLOYMENT_TARGET = 11.0;
2818-
MARKETING_VERSION = 2.6.1;
2818+
MARKETING_VERSION = 2.6.2;
28192819
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
28202820
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
28212821
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2844,7 +2844,7 @@
28442844
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
28452845
CODE_SIGN_STYLE = Manual;
28462846
COMBINE_HIDPI_IMAGES = YES;
2847-
CURRENT_PROJECT_VERSION = 240628;
2847+
CURRENT_PROJECT_VERSION = 240701;
28482848
DEAD_CODE_STRIPPING = YES;
28492849
DEVELOPMENT_TEAM = "";
28502850
ENABLE_APP_SANDBOX = NO;
@@ -2863,7 +2863,7 @@
28632863
);
28642864
LLVM_LTO = YES_THIN;
28652865
MACOSX_DEPLOYMENT_TARGET = 11.0;
2866-
MARKETING_VERSION = 2.6.1;
2866+
MARKETING_VERSION = 2.6.2;
28672867
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
28682868
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
28692869
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)