Skip to content

Commit aa47482

Browse files
dirkwhoffmanndirkwhoffmann
committed
This is vAmiga 4.0b3
1 parent da93067 commit aa47482

File tree

5 files changed

+29
-26
lines changed

5 files changed

+29
-26
lines changed

‎Emulator/VAmigaConfig.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
static constexpr int VER_MAJOR = 4;
1818
static constexpr int VER_MINOR = 0;
1919
static constexpr int VER_SUBMINOR = 0;
20-
static constexpr int VER_BETA = 2;
20+
static constexpr int VER_BETA = 3;
2121

2222
// Snapshot version number
2323
static constexpr int SNP_MAJOR = 4;
2424
static constexpr int SNP_MINOR = 0;
2525
static constexpr int SNP_SUBMINOR = 0;
26-
static constexpr int SNP_BETA = 2;
26+
static constexpr int SNP_BETA = 3;
2727

2828

2929
//

‎GUI/Dialogs/Configuration/ConfigurationController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ class ConfigurationController: DialogController {
180180
@IBOutlet weak var prfVSync: NSButton!
181181
@IBOutlet weak var prfSpeedBoost: NSSlider!
182182
@IBOutlet weak var prfSpeedBoostInfo: NSTextField!
183+
@IBOutlet weak var prfRunAheadLabel: NSTextField!
183184
@IBOutlet weak var prfRunAhead: NSSlider!
184185
@IBOutlet weak var prfRunAheadInfo: NSTextField!
185186

‎GUI/Dialogs/Configuration/PerformanceConf.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ extension ConfigurationController {
2626
prfSpeedBoostInfo.stringValue = "\(config.speedBoost) %"
2727
prfSpeedBoost.isEnabled = !vsync
2828
prfSpeedBoostInfo.textColor = vsync ? .tertiaryLabelColor : .labelColor
29+
prfRunAheadLabel.stringValue = runAhead >= 0 ? "Run ahead:" : "Run behind:"
2930
prfRunAhead.integerValue = runAhead
30-
prfRunAheadInfo.stringValue = "\(runAhead) frame" + (runAhead == 1 ? "" : "s")
31+
prfRunAheadInfo.stringValue = "\(abs(runAhead)) frame" + (abs(runAhead) == 1 ? "" : "s")
3132

3233
// Boosters
3334
prfCiaIdleSleep.state = config.ciaIdleSleep ? .on : .off

‎GUI/XIB files/Configuration.xib‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
<outlet property="prfPowerButton" destination="Qwc-dN-z7X" id="dyR-6O-RRs"/>
146146
<outlet property="prfRunAhead" destination="eeE-9P-GOA" id="2XG-4W-0Ip"/>
147147
<outlet property="prfRunAheadInfo" destination="QxE-Mv-W98" id="zmi-lu-h4q"/>
148+
<outlet property="prfRunAheadLabel" destination="Xbm-XD-YYA" id="geJ-xE-7kz"/>
148149
<outlet property="prfSnapCompressor" destination="6ta-yK-MgR" id="niI-0R-To2"/>
149150
<outlet property="prfSpeedBoost" destination="8H2-RW-mQb" id="Krk-Il-YFn"/>
150151
<outlet property="prfSpeedBoostInfo" destination="6IB-5J-YHo" id="JhN-Dh-OM8"/>
@@ -2011,7 +2012,7 @@ DQ
20112012
</textFieldCell>
20122013
</textField>
20132014
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nbm-Pv-9Oh">
2014-
<rect key="frame" x="27" y="351" width="75" height="19"/>
2015+
<rect key="frame" x="27" y="347" width="75" height="19"/>
20152016
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
20162017
<textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Activation:" id="aXm-zw-qjR">
20172018
<font key="font" metaFont="system"/>
@@ -2020,7 +2021,7 @@ DQ
20202021
</textFieldCell>
20212022
</textField>
20222023
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pfH-kW-gpK">
2023-
<rect key="frame" x="33" y="320" width="148" height="19"/>
2024+
<rect key="frame" x="33" y="316" width="148" height="19"/>
20242025
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
20252026
<textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="left" title="Boot in warp mode for" id="lD4-FP-RLh">
20262027
<font key="font" metaFont="system"/>
@@ -2029,7 +2030,7 @@ DQ
20292030
</textFieldCell>
20302031
</textField>
20312032
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7yD-mR-YgB">
2032-
<rect key="frame" x="207" y="321" width="60" height="19"/>
2033+
<rect key="frame" x="207" y="316" width="60" height="19"/>
20332034
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
20342035
<textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="left" title="seconds" id="guB-Zs-uSM">
20352036
<font key="font" metaFont="system"/>
@@ -2038,7 +2039,7 @@ DQ
20382039
</textFieldCell>
20392040
</textField>
20402041
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MSH-Uz-sGW">
2041-
<rect key="frame" x="103" y="346" width="162" height="26"/>
2042+
<rect key="frame" x="103" y="342" width="162" height="26"/>
20422043
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
20432044
<popUpButtonCell key="cell" type="push" title="During disk activity" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" autoenablesItems="NO" selectedItem="f9k-XO-Ai7" id="2n6-8b-MKB">
20442045
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -2062,7 +2063,7 @@ DQ
20622063
</connections>
20632064
</popUpButton>
20642065
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wuN-XX-gdx">
2065-
<rect key="frame" x="337" y="191" width="88" height="19"/>
2066+
<rect key="frame" x="337" y="192" width="88" height="19"/>
20662067
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
20672068
<textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Workspaces:" id="ky3-mT-bvn">
20682069
<font key="font" metaFont="system"/>
@@ -2071,7 +2072,7 @@ DQ
20712072
</textFieldCell>
20722073
</textField>
20732074
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lBZ-rr-dyq">
2074-
<rect key="frame" x="337" y="162" width="88" height="19"/>
2075+
<rect key="frame" x="337" y="161" width="88" height="19"/>
20752076
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
20762077
<textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Snapshots:" id="lf9-Wc-YlQ">
20772078
<font key="font" metaFont="system"/>
@@ -2101,7 +2102,7 @@ DQ
21012102
</connections>
21022103
</popUpButton>
21032104
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="X5X-QE-QMJ">
2104-
<rect key="frame" x="176" y="321" width="25" height="21"/>
2105+
<rect key="frame" x="176" y="315" width="25" height="21"/>
21052106
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
21062107
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" title="99" drawsBackground="YES" id="aYN-wG-Aop">
21072108
<numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="JR1-Kp-eAn"/>
@@ -2159,15 +2160,15 @@ DQ
21592160
</textFieldCell>
21602161
</textField>
21612162
<slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8H2-RW-mQb">
2162-
<rect key="frame" x="104" y="156" width="107" height="28"/>
2163+
<rect key="frame" x="104" y="155" width="107" height="28"/>
21632164
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
21642165
<sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="50" maxValue="200" doubleValue="100" tickMarkPosition="above" numberOfTickMarks="4" sliderType="linear" id="E5C-ng-bB8"/>
21652166
<connections>
21662167
<action selector="prfspeedBoostAction:" target="-2" id="nEi-sD-nI9"/>
21672168
</connections>
21682169
</slider>
21692170
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qsk-tO-tiU">
2170-
<rect key="frame" x="343" y="348" width="155" height="18"/>
2171+
<rect key="frame" x="343" y="347" width="155" height="18"/>
21712172
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
21722173
<buttonCell key="cell" type="check" title="Put idle CIAs to sleep" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="xe7-b8-I8h">
21732174
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -2189,7 +2190,7 @@ DQ
21892190
</connections>
21902191
</button>
21912192
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mXS-g2-Oft">
2192-
<rect key="frame" x="343" y="318" width="216" height="18"/>
2193+
<rect key="frame" x="343" y="317" width="216" height="18"/>
21932194
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
21942195
<buttonCell key="cell" type="check" title="Put idle audio backend to sleep" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="En6-cj-cXw">
21952196
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -2200,7 +2201,7 @@ DQ
22002201
</connections>
22012202
</button>
22022203
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bvy-6w-UaV">
2203-
<rect key="frame" x="104" y="194" width="70" height="18"/>
2204+
<rect key="frame" x="104" y="193" width="70" height="18"/>
22042205
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
22052206
<buttonCell key="cell" type="check" title="VSYNC" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="vxY-WT-Pqs">
22062207
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -2211,15 +2212,15 @@ DQ
22112212
</connections>
22122213
</button>
22132214
<slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eeE-9P-GOA">
2214-
<rect key="frame" x="104" y="127" width="107" height="28"/>
2215+
<rect key="frame" x="104" y="126" width="107" height="28"/>
22152216
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
22162217
<sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="-7" maxValue="7" tickMarkPosition="above" numberOfTickMarks="15" allowsTickMarkValuesOnly="YES" sliderType="linear" id="wtI-Qm-zG1"/>
22172218
<connections>
22182219
<action selector="prfRunAheadAction:" target="-2" id="h7Z-Xm-w7D"/>
22192220
</connections>
22202221
</slider>
22212222
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xbm-XD-YYA">
2222-
<rect key="frame" x="15" y="132" width="85" height="20"/>
2223+
<rect key="frame" x="15" y="131" width="85" height="20"/>
22232224
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
22242225
<textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Run ahead:" id="k4E-d3-iMu">
22252226
<font key="font" metaFont="system"/>
@@ -2228,7 +2229,7 @@ DQ
22282229
</textFieldCell>
22292230
</textField>
22302231
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QxE-Mv-W98">
2231-
<rect key="frame" x="215" y="128" width="80" height="23"/>
2232+
<rect key="frame" x="215" y="127" width="80" height="23"/>
22322233
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
22332234
<textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="left" title="0 frames" id="aL4-dm-gid">
22342235
<font key="font" metaFont="system"/>
@@ -2237,7 +2238,7 @@ DQ
22372238
</textFieldCell>
22382239
</textField>
22392240
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6ta-yK-MgR">
2240-
<rect key="frame" x="428" y="157" width="144" height="26"/>
2241+
<rect key="frame" x="428" y="156" width="144" height="26"/>
22412242
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
22422243
<popUpButtonCell key="cell" type="push" title="Off" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" autoenablesItems="NO" selectedItem="N9p-p6-i6u" id="kze-aY-Cm4">
22432244
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>

‎vAmiga.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3149,7 +3149,7 @@
31493149
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
31503150
CODE_SIGN_STYLE = Manual;
31513151
COMBINE_HIDPI_IMAGES = YES;
3152-
CURRENT_PROJECT_VERSION = 250214;
3152+
CURRENT_PROJECT_VERSION = 250216;
31533153
DEAD_CODE_STRIPPING = YES;
31543154
DEVELOPMENT_TEAM = "";
31553155
ENABLE_APP_SANDBOX = NO;
@@ -3171,7 +3171,7 @@
31713171
"@executable_path/../Frameworks",
31723172
);
31733173
MACOSX_DEPLOYMENT_TARGET = 13.5;
3174-
MARKETING_VERSION = 4.0b2;
3174+
MARKETING_VERSION = 4.0b3;
31753175
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
31763176
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
31773177
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3201,7 +3201,7 @@
32013201
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32023202
CODE_SIGN_STYLE = Manual;
32033203
COMBINE_HIDPI_IMAGES = YES;
3204-
CURRENT_PROJECT_VERSION = 250214;
3204+
CURRENT_PROJECT_VERSION = 250216;
32053205
DEAD_CODE_STRIPPING = YES;
32063206
DEVELOPMENT_TEAM = "";
32073207
ENABLE_APP_SANDBOX = NO;
@@ -3221,7 +3221,7 @@
32213221
);
32223222
LLVM_LTO = YES_THIN;
32233223
MACOSX_DEPLOYMENT_TARGET = 13.5;
3224-
MARKETING_VERSION = 4.0b2;
3224+
MARKETING_VERSION = 4.0b3;
32253225
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
32263226
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
32273227
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3245,7 +3245,7 @@
32453245
CODE_SIGN_IDENTITY = "Apple Development";
32463246
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32473247
CODE_SIGN_STYLE = Automatic;
3248-
CURRENT_PROJECT_VERSION = 250214;
3248+
CURRENT_PROJECT_VERSION = 250216;
32493249
DEVELOPMENT_TEAM = "";
32503250
ENABLE_HARDENED_RUNTIME = YES;
32513251
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3261,7 +3261,7 @@
32613261
);
32623262
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
32633263
MACOSX_DEPLOYMENT_TARGET = 15.1;
3264-
MARKETING_VERSION = 4.0b2;
3264+
MARKETING_VERSION = 4.0b3;
32653265
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
32663266
PRODUCT_NAME = "$(TARGET_NAME)";
32673267
SKIP_INSTALL = YES;
@@ -3279,7 +3279,7 @@
32793279
CODE_SIGN_IDENTITY = "Apple Development";
32803280
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32813281
CODE_SIGN_STYLE = Automatic;
3282-
CURRENT_PROJECT_VERSION = 250214;
3282+
CURRENT_PROJECT_VERSION = 250216;
32833283
DEVELOPMENT_TEAM = "";
32843284
ENABLE_HARDENED_RUNTIME = YES;
32853285
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3295,7 +3295,7 @@
32953295
);
32963296
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
32973297
MACOSX_DEPLOYMENT_TARGET = 15.1;
3298-
MARKETING_VERSION = 4.0b2;
3298+
MARKETING_VERSION = 4.0b3;
32993299
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
33003300
PRODUCT_NAME = "$(TARGET_NAME)";
33013301
SKIP_INSTALL = YES;

0 commit comments

Comments
 (0)