diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in index a0158b33f..305e4258c 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index c8bca0fa2..218c1f553 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -432,6 +432,7 @@ debuggerrun = debugger #DOSBOX-X-ADV:# allow more than 640kb base memory: If set, and space is available, allow conventional memory to extend past 640KB. #DOSBOX-X-ADV:# For example, if machine=cga, conventional memory can extend out to 0xB800 and provide up to 736KB of RAM. #DOSBOX-X-ADV:# This allows you to emulate PC/XT style memory extensions. +#DOSBOX-X-ADV:# For machine=tandy, this enables up to 768KB of memory which is then provided as 640KB to DOS to emulate the Tandy 768KB configuration with no overlap between DOS and video memory #DOSBOX-X-ADV:# enable pci bus: Enable PCI bus emulation #DOSBOX-X-ADV-SEE:# #DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): @@ -1322,7 +1323,7 @@ splash = true nosound = false sample accurate = false swapstereo = false -rate = 44100 +rate = 48000 blocksize = 1024 prebuffer = 25 @@ -1517,6 +1518,9 @@ fluid.soundfont = #DOSBOX-X-ADV:# There are some DOS games/demos that use single-cycle DSP playback in their music tracker and they micromanage #DOSBOX-X-ADV:# the DMA transfer per block poorly in a way that causes popping and artifacts. Setting this option to 0 for #DOSBOX-X-ADV:# such DOS applications may reduce audible popping and artifacts. +# listen to recording source: When the guest records audio from the Sound Blaster card, send the input source to the speakers as well so it can be heard. +# recording source: Audio source to use when guest is recording audio. At this time only generated audio sources are available. +# Possible values: silence, hiss, 1khz tone. #DOSBOX-X-ADV:# irq hack: Specify a hack related to the Sound Blaster IRQ to avoid crashes in a handful of games and demos. #DOSBOX-X-ADV:# none Emulate IRQs normally #DOSBOX-X-ADV:# cs_equ_ds Do not fire IRQ unless two CPU segment registers match: CS == DS. Read DOSBox-X Wiki or source code for details. @@ -1624,6 +1628,8 @@ sbtype = sb16 sbbase = 220 irq = 7 #DOSBOX-X-ADV:mindma = -1 +listen to recording source = false +recording source = silence #DOSBOX-X-ADV:irq hack = none dma = 1 hdma = 5 @@ -2192,7 +2198,7 @@ timeout = 0 # quick reboot: If set, the DOS restart call will reboot the emulated DOS (integrated DOS or guest DOS) instead of the virtual machine. # # ver: Set DOS version. Specify as major.minor format. A single number is treated as the major version (compatible with LFN support). Common settings are: -# auto (or unset) Pick a DOS kernel version automatically +# auto (or unset) Pick DOS kernel version 5.0 (DOSBox default) # 3.3 MS-DOS 3.3 emulation (not tested!) # 5.0 MS-DOS 5.0 emulation (recommended for DOS gaming) # 6.22 MS-DOS 6.22 emulation @@ -2273,6 +2279,7 @@ timeout = 0 # If unset or invalid, the default name CLIP$ will be used (e.g. "TYPE CLIP$" shows the clipboard contents). # It has no effect if "dos clipboard device enable" is disabled, and it is deactivated if the secure mode is enabled. # dos clipboard api: If set, DOS APIs for communications with the Windows clipboard will be enabled for shared clipboard communications. +# dos idle api: If set, DOSBox-X can lower the host system's CPU load when a supported guest program is idle. #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:# -> badcommandhandler; hma allow reservation; special operation file prefix; drive z is remote; drive z convert fat; drive z expand path; drive z hide files; hidenonrepresentable; hma minimum allocation; dos sda size; hma free space; cpm compatibility mode; minimum dos initial private segment; minimum mcb segment; enable dummy device mcb; maximum environment block size on exec; additional environment block size on exec; enable a20 on windows init; zero memory on xms memory allocation; vcpi; unmask timer on disk io; zero int 67h if no ems; zero unused int 68h; emm386 startup active; zero memory on ems memory allocation; ems system handle memory size; ems system handle on even megabyte; umb start; umb end; kernel allocation in umb; keep umb on boot; keep private area on boot; private area in umb; autoa20fix; autoloadfix; startincon; int33 hide host cursor if interrupt subroutine; int33 hide host cursor when polling; int33 disable cell granularity; int 13 disk change detect; int 13 extensions; biosps2; int15 wait force unmask irq; int15 mouse callback does not preserve registers; filenamechar; collating and uppercase; con device use int 16h to detect keyboard input; zero memory on int 21h memory allocation; pipe temporary device @@ -2361,6 +2368,7 @@ dbcs = true dos clipboard device enable = false dos clipboard device name = CLIP$ dos clipboard api = true +dos idle api = true [ipx] # ipx: Enable ipx over UDP/IP emulation. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index f9be46da7..13d47365c 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -593,7 +593,7 @@ splash = true nosound = false sample accurate = false swapstereo = false -rate = 44100 +rate = 48000 blocksize = 1024 prebuffer = 25 @@ -652,6 +652,9 @@ fluid.soundfont = # irq: The IRQ number of the Sound Blaster (usually 5 or 7, depending on the sound card type and the game). # Set to 0 for the default setting of the sound card, or set to -1 to start DOSBox-X with the IRQ unassigned. # Possible values: 7, 5, 3, 9, 10, 11, 12, 0, -1. +# listen to recording source: When the guest records audio from the Sound Blaster card, send the input source to the speakers as well so it can be heard. +# recording source: Audio source to use when guest is recording audio. At this time only generated audio sources are available. +# Possible values: silence, hiss, 1khz tone. # dma: The DMA number of the Sound Blaster. Set to -1 to start DOSBox-X with the DMA unassigned. # Possible values: 1, 5, 0, 3, 6, 7, -1. # hdma: The High DMA number of the Sound Blaster. Set to -1 to start DOSBox-X with the High DMA unassigned. @@ -684,6 +687,8 @@ fluid.soundfont = sbtype = sb16 sbbase = 220 irq = 7 +listen to recording source = false +recording source = silence dma = 1 hdma = 5 enable speaker = false @@ -1048,7 +1053,7 @@ timeout = 0 # quick reboot: If set, the DOS restart call will reboot the emulated DOS (integrated DOS or guest DOS) instead of the virtual machine. # # ver: Set DOS version. Specify as major.minor format. A single number is treated as the major version (compatible with LFN support). Common settings are: -# auto (or unset) Pick a DOS kernel version automatically +# auto (or unset) Pick DOS kernel version 5.0 (DOSBox default) # 3.3 MS-DOS 3.3 emulation (not tested!) # 5.0 MS-DOS 5.0 emulation (recommended for DOS gaming) # 6.22 MS-DOS 6.22 emulation @@ -1093,6 +1098,7 @@ timeout = 0 # If unset or invalid, the default name CLIP$ will be used (e.g. "TYPE CLIP$" shows the clipboard contents). # It has no effect if "dos clipboard device enable" is disabled, and it is deactivated if the secure mode is enabled. # dos clipboard api: If set, DOS APIs for communications with the Windows clipboard will be enabled for shared clipboard communications. +# dos idle api: If set, DOSBox-X can lower the host system's CPU load when a supported guest program is idle. # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): # -> badcommandhandler; hma allow reservation; special operation file prefix; drive z is remote; drive z convert fat; drive z expand path; drive z hide files; hidenonrepresentable; hma minimum allocation; dos sda size; hma free space; cpm compatibility mode; minimum dos initial private segment; minimum mcb segment; enable dummy device mcb; maximum environment block size on exec; additional environment block size on exec; enable a20 on windows init; zero memory on xms memory allocation; vcpi; unmask timer on disk io; zero int 67h if no ems; zero unused int 68h; emm386 startup active; zero memory on ems memory allocation; ems system handle memory size; ems system handle on even megabyte; umb start; umb end; kernel allocation in umb; keep umb on boot; keep private area on boot; private area in umb; autoa20fix; autoloadfix; startincon; int33 hide host cursor if interrupt subroutine; int33 hide host cursor when polling; int33 disable cell granularity; int 13 disk change detect; int 13 extensions; biosps2; int15 wait force unmask irq; int15 mouse callback does not preserve registers; filenamechar; collating and uppercase; con device use int 16h to detect keyboard input; zero memory on int 21h memory allocation; pipe temporary device @@ -1132,6 +1138,7 @@ dbcs = true dos clipboard device enable = false dos clipboard device name = CLIP$ dos clipboard api = true +dos idle api = true [ipx] # ipx: Enable ipx over UDP/IP emulation. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index c075504cb..be2249269 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -424,6 +424,7 @@ debuggerrun = debugger # allow more than 640kb base memory: If set, and space is available, allow conventional memory to extend past 640KB. # For example, if machine=cga, conventional memory can extend out to 0xB800 and provide up to 736KB of RAM. # This allows you to emulate PC/XT style memory extensions. +# For machine=tandy, this enables up to 768KB of memory which is then provided as 640KB to DOS to emulate the Tandy 768KB configuration with no overlap between DOS and video memory # enable pci bus: Enable PCI bus emulation language = title = @@ -1286,7 +1287,7 @@ splash = true nosound = false sample accurate = false swapstereo = false -rate = 44100 +rate = 48000 blocksize = 1024 prebuffer = 25 @@ -1477,6 +1478,9 @@ fluid.chorus.type = 0 # There are some DOS games/demos that use single-cycle DSP playback in their music tracker and they micromanage # the DMA transfer per block poorly in a way that causes popping and artifacts. Setting this option to 0 for # such DOS applications may reduce audible popping and artifacts. +# listen to recording source: When the guest records audio from the Sound Blaster card, send the input source to the speakers as well so it can be heard. +# recording source: Audio source to use when guest is recording audio. At this time only generated audio sources are available. +# Possible values: silence, hiss, 1khz tone. # irq hack: Specify a hack related to the Sound Blaster IRQ to avoid crashes in a handful of games and demos. # none Emulate IRQs normally # cs_equ_ds Do not fire IRQ unless two CPU segment registers match: CS == DS. Read DOSBox-X Wiki or source code for details. @@ -1580,6 +1584,8 @@ sbtype = sb16 sbbase = 220 irq = 7 mindma = -1 +listen to recording source = false +recording source = silence irq hack = none dma = 1 hdma = 5 @@ -2136,7 +2142,7 @@ timeout = 0 # quick reboot: If set, the DOS restart call will reboot the emulated DOS (integrated DOS or guest DOS) instead of the virtual machine. # # ver: Set DOS version. Specify as major.minor format. A single number is treated as the major version (compatible with LFN support). Common settings are: -# auto (or unset) Pick a DOS kernel version automatically +# auto (or unset) Pick DOS kernel version 5.0 (DOSBox default) # 3.3 MS-DOS 3.3 emulation (not tested!) # 5.0 MS-DOS 5.0 emulation (recommended for DOS gaming) # 6.22 MS-DOS 6.22 emulation @@ -2217,6 +2223,7 @@ timeout = 0 # If unset or invalid, the default name CLIP$ will be used (e.g. "TYPE CLIP$" shows the clipboard contents). # It has no effect if "dos clipboard device enable" is disabled, and it is deactivated if the secure mode is enabled. # dos clipboard api: If set, DOS APIs for communications with the Windows clipboard will be enabled for shared clipboard communications. +# dos idle api: If set, DOSBox-X can lower the host system's CPU load when a supported guest program is idle. xms = true xms handles = 0 shell configuration as commands = false @@ -2301,6 +2308,7 @@ pipe temporary device = true dos clipboard device enable = false dos clipboard device name = CLIP$ dos clipboard api = true +dos idle api = true [ipx] # ipx: Enable ipx over UDP/IP emulation. diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 0b6adb97b..ed22f7ce1 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Dec 31, 2022 8:40:57pm" -#define GIT_COMMIT_HASH "00a190d" +#define UPDATED_STR "Feb 16, 2023 10:47:47am" +#define GIT_COMMIT_HASH "868fcc7" #define COPYRIGHT_END_YEAR "2023"