Prepare for release, again

joncampbell123 · Dec 27, 2022 · a5c0d2a · a5c0d2a
1 parent 6f277dd
commit a5c0d2a
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 25 deletions.
diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:German
 :DOSBOX-X:CODEPAGE:850
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Befehle in diesen Zeilen werden zum Start ausgeführt.

diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:English (United States)
 :DOSBOX-X:CODEPAGE:437
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Lines in this section will be run at startup.

diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Spanish (Spain)
 :DOSBOX-X:CODEPAGE:858
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Las líneas de esta sección se iniciarán al inicio.

diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:French (France)
 :DOSBOX-X:CODEPAGE:859
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Les lignes de cette section seront exécutées au démarrage.

diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Japanese
 :DOSBOX-X:CODEPAGE:932
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします
 :AUTOEXEC_CONFIGFILE_HELP
 このセクションに記載の行は起動時に実行されます。

diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Korean
 :DOSBOX-X:CODEPAGE:949
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다.
 :AUTOEXEC_CONFIGFILE_HELP
 이 섹션에 나열된 줄은 시작할 때 실행됩니다.

diff --git a/contrib/translations/nl/nl_NL.lng b/contrib/translations/nl/nl_NL.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Nederlands (Nederland)
 :DOSBOX-X:CODEPAGE:858
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Lijnen in dit gedeelte worden uitgevoerd bij opstarten.

diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Portuguese (Brazil)
 :DOSBOX-X:CODEPAGE:860
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X.

diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Turkish (Turkey)
 :DOSBOX-X:CODEPAGE:857
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Lines in this section will be run at startup.

diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Simplified Chinese
 :DOSBOX-X:CODEPAGE:936
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印
 :AUTOEXEC_CONFIGFILE_HELP
 Lines in this section will be run at startup.

diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Traditional Chinese
 :DOSBOX-X:CODEPAGE:950
-:DOSBOX-X:VERSION:2022.09.1
+:DOSBOX-X:VERSION:2022.12.26
 :DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印
 :AUTOEXEC_CONFIGFILE_HELP
 段落中的指令行會在啟動時執行.

diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss
@@ -1,5 +1,5 @@
 #define MyAppName "DOSBox-X"
-#define MyAppVersion "2022.09.1"
+#define MyAppVersion "2022.12.26"
 #define MyAppBit "(32-bit)"
 #define MyAppPublisher "joncampbell123 [DOSBox-X Team]"
 #define MyAppURL "https://dosbox-x.com/"

diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf
@@ -1,4 +1,4 @@
-# This is the configuration file for DOSBox-X 2022.09.1. (Please use the latest version of DOSBox-X)
+# This is the configuration file for DOSBox-X 2022.12.26. (Please use the latest version of DOSBox-X)
 # Lines starting with a # are comment lines and are ignored by DOSBox-X.
 # They are used to (briefly) document the effect of each option.
 # To write out ALL options, use command 'config -all' with -wc or -writeconf options.
@@ -1034,6 +1034,8 @@ vsyncrate = 75
 #                                                    Possible values: auto, dynamic, dynamic_x86, dynamic_nodhfpu, dynamic, dynamic_rec, normal, full, simple.
 #                                             fpu: Enable FPU emulation
 #                                                    Possible values: true, false, 1, 0, auto, 8087, 287, 387.
+#DOSBOX-X-ADV:#                                    cpuid string: If set, changes the string returned by the CPUID instruction. Normally by default the string is 'GenuineIntel'.
+#DOSBOX-X-ADV:#                                                    CAUTION: Custom strings can interfere with guest code CPU detection
 #DOSBOX-X-ADV:#                         processor serial number: For Pentium III emulation, this sets the 96-bit Processor Serial Number returned by CPUID.
 #DOSBOX-X-ADV:#                                                    If not set, then emulation will act as if the PSN has been disabled by the BIOS.
 #DOSBOX-X-ADV:#                                                    Enter as 4 sets of 16-bit hexadecimal digits XXXX-XXXX-XXXX-XXXX.
@@ -1130,10 +1132,11 @@ vsyncrate = 75
 #DOSBOX-X-ADV:#                                                    then jump to realmode with B still set (aka Huge Unreal mode). Needed for Project Angel.
 #DOSBOX-X-ADV-SEE:#
 #DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
-#DOSBOX-X-ADV-SEE:# -> processor serial number; double fault; clear trap flag on unhandled int 1; reset on triple fault; always report double fault; always report triple fault; mask stack pointer for enter leave instructions; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device pnp; isapnpport; realbig16
+#DOSBOX-X-ADV-SEE:# -> cpuid string; processor serial number; double fault; clear trap flag on unhandled int 1; reset on triple fault; always report double fault; always report triple fault; mask stack pointer for enter leave instructions; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device pnp; isapnpport; realbig16
 #DOSBOX-X-ADV-SEE:#
 core                                            = auto
 fpu                                             = true
+#DOSBOX-X-ADV:cpuid string                                    = 
 #DOSBOX-X-ADV:processor serial number                         = 
 segment limits                                  = true
 #DOSBOX-X-ADV:double fault                                    = true
@@ -1417,6 +1420,12 @@ prebuffer       = 25
 #DOSBOX-X-ADV:#                            Quick changes of volume or expression on a MIDI channel may result in amp jumps on real hardware.
 #DOSBOX-X-ADV:#                            When "Nice Amp Ramp" mode is enabled (default), amp changes gradually instead.
 #DOSBOX-X-ADV:#                            Otherwise, the emulation accuracy is preserved.
+#DOSBOX-X-ADV:#    mt32.engage.channel1: Use alternative channel assignment on synth start.
+#DOSBOX-X-ADV:#                            By default, MT-32 compatible devices only react on MIDI messages that come on MIDI channels 2-10 ignoring messages
+#DOSBOX-X-ADV:#                            on MIDI channel 1. However, some tunes involve MIDI channel 1 yet do not initialise the device accordingly.
+#DOSBOX-X-ADV:#                            In such cases, one might fix this by pressing a magic button combination on MT-32 front panel.
+#DOSBOX-X-ADV:#                            Enabling this property has the same effect: the device starts recognising messages on MIDI channels 1-8 and 10 instead.
+#DOSBOX-X-ADV:#                            Default is false.
 #            fluid.driver: Driver to use with Fluidsynth, not needed under Windows. Available drivers depend on what Fluidsynth was compiled with.
 #                            Possible values: pulseaudio, alsa, oss, coreaudio, dsound, portaudio, sndman, jack, file, default.
 #         fluid.soundfont: Soundfont (.SF2 or .SF3) to use with Fluidsynth. One must be specified (e.g. GeneralUser_GS.sf2).
@@ -1442,7 +1451,7 @@ prebuffer       = 25
 #DOSBOX-X-ADV:#                            Possible values: 0, 1.
 #DOSBOX-X-ADV-SEE:#
 #DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
-#DOSBOX-X-ADV-SEE:# -> mt32.reverse.stereo; mt32.verbose; mt32.thread; mt32.chunk; mt32.prebuffer; mt32.partials; mt32.dac; mt32.analog; mt32.output.gain; mt32.reverb.mode; mt32.reverb.output.gain; mt32.reverb.time; mt32.reverb.level; mt32.rate; mt32.src.quality; mt32.niceampramp; fluid.samplerate; fluid.gain; fluid.polyphony; fluid.cores; fluid.periods; fluid.periodsize; fluid.reverb; fluid.chorus; fluid.reverb.roomsize; fluid.reverb.damping; fluid.reverb.width; fluid.reverb.level; fluid.chorus.number; fluid.chorus.level; fluid.chorus.speed; fluid.chorus.depth; fluid.chorus.type
+#DOSBOX-X-ADV-SEE:# -> mt32.reverse.stereo; mt32.verbose; mt32.thread; mt32.chunk; mt32.prebuffer; mt32.partials; mt32.dac; mt32.analog; mt32.output.gain; mt32.reverb.mode; mt32.reverb.output.gain; mt32.reverb.time; mt32.reverb.level; mt32.rate; mt32.src.quality; mt32.niceampramp; mt32.engage.channel1; fluid.samplerate; fluid.gain; fluid.polyphony; fluid.cores; fluid.periods; fluid.periodsize; fluid.reverb; fluid.chorus; fluid.reverb.roomsize; fluid.reverb.damping; fluid.reverb.width; fluid.reverb.level; fluid.chorus.number; fluid.chorus.level; fluid.chorus.speed; fluid.chorus.depth; fluid.chorus.type
 #DOSBOX-X-ADV-SEE:#
 mpu401                  = intelligent
 mpubase                 = 0
@@ -1468,6 +1477,7 @@ mt32.model              = auto
 #DOSBOX-X-ADV:mt32.rate               = 48000
 #DOSBOX-X-ADV:mt32.src.quality        = 2
 #DOSBOX-X-ADV:mt32.niceampramp        = true
+#DOSBOX-X-ADV:mt32.engage.channel1    = false
 fluid.driver            = default
 fluid.soundfont         = 
 #DOSBOX-X-ADV:fluid.samplerate        = 48000

diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf
@@ -1,4 +1,4 @@
-# This is the configuration file for DOSBox-X 2022.09.1. (Please use the latest version of DOSBox-X)
+# This is the configuration file for DOSBox-X 2022.12.26. (Please use the latest version of DOSBox-X)
 # Lines starting with a # are comment lines and are ignored by DOSBox-X.
 # They are used to (briefly) document the effect of each option.
 # To write out ALL options, use command 'config -all' with -wc or -writeconf options.
@@ -447,7 +447,7 @@ vsyncrate = 75
 #                       Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it.
 #
 # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
-# -> processor serial number; double fault; clear trap flag on unhandled int 1; reset on triple fault; always report double fault; always report triple fault; mask stack pointer for enter leave instructions; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device pnp; isapnpport; realbig16
+# -> cpuid string; processor serial number; double fault; clear trap flag on unhandled int 1; reset on triple fault; always report double fault; always report triple fault; mask stack pointer for enter leave instructions; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; stop turbo on key; stop turbo after second; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apm power button event; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device pnp; isapnpport; realbig16
 #
 core               = auto
 fpu                = true
@@ -622,7 +622,7 @@ prebuffer       = 25
 # fluid.soundfont: Soundfont (.SF2 or .SF3) to use with Fluidsynth. One must be specified (e.g. GeneralUser_GS.sf2).
 #
 # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
-# -> mt32.reverse.stereo; mt32.verbose; mt32.thread; mt32.chunk; mt32.prebuffer; mt32.partials; mt32.dac; mt32.analog; mt32.output.gain; mt32.reverb.mode; mt32.reverb.output.gain; mt32.reverb.time; mt32.reverb.level; mt32.rate; mt32.src.quality; mt32.niceampramp; fluid.samplerate; fluid.gain; fluid.polyphony; fluid.cores; fluid.periods; fluid.periodsize; fluid.reverb; fluid.chorus; fluid.reverb.roomsize; fluid.reverb.damping; fluid.reverb.width; fluid.reverb.level; fluid.chorus.number; fluid.chorus.level; fluid.chorus.speed; fluid.chorus.depth; fluid.chorus.type
+# -> mt32.reverse.stereo; mt32.verbose; mt32.thread; mt32.chunk; mt32.prebuffer; mt32.partials; mt32.dac; mt32.analog; mt32.output.gain; mt32.reverb.mode; mt32.reverb.output.gain; mt32.reverb.time; mt32.reverb.level; mt32.rate; mt32.src.quality; mt32.niceampramp; mt32.engage.channel1; fluid.samplerate; fluid.gain; fluid.polyphony; fluid.cores; fluid.periods; fluid.periodsize; fluid.reverb; fluid.chorus; fluid.reverb.roomsize; fluid.reverb.damping; fluid.reverb.width; fluid.reverb.level; fluid.chorus.number; fluid.chorus.level; fluid.chorus.speed; fluid.chorus.depth; fluid.chorus.type
 #
 mpu401          = intelligent
 mpubase         = 0

diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf
@@ -1,4 +1,4 @@
-# This is the configuration file for DOSBox-X 2022.09.1. (Please use the latest version of DOSBox-X)
+# This is the configuration file for DOSBox-X 2022.12.26. (Please use the latest version of DOSBox-X)
 # Lines starting with a # are comment lines and are ignored by DOSBox-X.
 # They are used to (briefly) document the effect of each option.
 # To write out ALL options, use command 'config -all' with -wc or -writeconf options.
@@ -1006,6 +1006,8 @@ vsyncrate = 75
 #                                                    Possible values: auto, dynamic, dynamic_x86, dynamic_nodhfpu, dynamic, dynamic_rec, normal, full, simple.
 #                                             fpu: Enable FPU emulation
 #                                                    Possible values: true, false, 1, 0, auto, 8087, 287, 387.
+#                                    cpuid string: If set, changes the string returned by the CPUID instruction. Normally by default the string is 'GenuineIntel'.
+#                                                    CAUTION: Custom strings can interfere with guest code CPU detection
 #                         processor serial number: For Pentium III emulation, this sets the 96-bit Processor Serial Number returned by CPUID.
 #                                                    If not set, then emulation will act as if the PSN has been disabled by the BIOS.
 #                                                    Enter as 4 sets of 16-bit hexadecimal digits XXXX-XXXX-XXXX-XXXX.
@@ -1102,6 +1104,7 @@ vsyncrate = 75
 #                                                    then jump to realmode with B still set (aka Huge Unreal mode). Needed for Project Angel.
 core                                            = auto
 fpu                                             = true
+cpuid string                                    = 
 processor serial number                         = 
 segment limits                                  = true
 double fault                                    = true
@@ -1381,6 +1384,12 @@ prebuffer       = 25
 #                            Quick changes of volume or expression on a MIDI channel may result in amp jumps on real hardware.
 #                            When "Nice Amp Ramp" mode is enabled (default), amp changes gradually instead.
 #                            Otherwise, the emulation accuracy is preserved.
+#    mt32.engage.channel1: Use alternative channel assignment on synth start.
+#                            By default, MT-32 compatible devices only react on MIDI messages that come on MIDI channels 2-10 ignoring messages
+#                            on MIDI channel 1. However, some tunes involve MIDI channel 1 yet do not initialise the device accordingly.
+#                            In such cases, one might fix this by pressing a magic button combination on MT-32 front panel.
+#                            Enabling this property has the same effect: the device starts recognising messages on MIDI channels 1-8 and 10 instead.
+#                            Default is false.
 #            fluid.driver: Driver to use with Fluidsynth, not needed under Windows. Available drivers depend on what Fluidsynth was compiled with.
 #                            Possible values: pulseaudio, alsa, oss, coreaudio, dsound, portaudio, sndman, jack, file, default.
 #         fluid.soundfont: Soundfont (.SF2 or .SF3) to use with Fluidsynth. One must be specified (e.g. GeneralUser_GS.sf2).
@@ -1428,6 +1437,7 @@ mt32.reverb.level       = 3
 mt32.rate               = 48000
 mt32.src.quality        = 2
 mt32.niceampramp        = true
+mt32.engage.channel1    = false
 fluid.driver            = default
 fluid.soundfont         = 
 fluid.samplerate        = 48000

diff --git a/include/build_timestamp.h b/include/build_timestamp.h
@@ -1,4 +1,4 @@
 /*auto-generated*/
-#define UPDATED_STR "Dec 26, 2022 6:12:50pm"
-#define GIT_COMMIT_HASH "43f3171"
+#define UPDATED_STR "Dec 26, 2022 6:27:42pm"
+#define GIT_COMMIT_HASH "6f277dd"
 #define COPYRIGHT_END_YEAR "2022"
diff --git a/src/winres.rc b/src/winres.rc
@@ -3,7 +3,7 @@
 #include "../include/resource.h"
 #include "../vs/config_package.h"
 
-#define VERSION_NUMBER 2022,09,1,0
+#define VERSION_NUMBER 2022,12,26,0
 
 // icon resource
 dosbox_ico ICON "../contrib/icons/dosbox-x.ico"

diff --git a/vs/config_package.h b/vs/config_package.h
@@ -1,8 +1,8 @@
 #define PACKAGE "dosbox-x"
 #define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues"
 #define PACKAGE_NAME "dosbox-x"
-#define PACKAGE_STRING "dosbox-x 2022.09.1"
+#define PACKAGE_STRING "dosbox-x 2022.12.26"
 #define PACKAGE_TARNAME "dosbox-x"
 #define PACKAGE_URL "https://dosbox-x.com"
-#define PACKAGE_VERSION "2022.09.1"
-#define VERSION "2022.09.1"
+#define PACKAGE_VERSION "2022.12.26"
+#define VERSION "2022.12.26"