From 08502f9d2c6b9ed3378dfe7b3daa07fbe25ad91a Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 16 Feb 2022 12:20:16 -0300 Subject: [PATCH 1/4] Remove ACPI shutdown button for v3.2 release --- usage/toolbar.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/usage/toolbar.rst b/usage/toolbar.rst index 2f74996..3ba30b1 100644 --- a/usage/toolbar.rst +++ b/usage/toolbar.rst @@ -17,11 +17,6 @@ Pause emulation of the machine. Press again to resume emulation. Force a reset of the emulated machine. Requires confirmation, which can be disabled by checking the *Don't show this message again* box. -|acpi_shutdown| ACPI shutdown ------------------------------ - -Initiate a clean shutdown of the emulated machine. Only available on machines with ACPI soft power off capability. - |send_cad| |send_cae| Press Ctrl+Alt+Del/Ctrl+Alt+Esc ------------------------------------------------------- From fd6805848b108229898d34b9cda98790c3bb711f Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 16 Feb 2022 12:57:07 -0300 Subject: [PATCH 2/4] Make DLL notices Windows-specific --- settings/ports.rst | 4 ++-- settings/sound.rst | 2 +- usage/menubar.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/settings/ports.rst b/settings/ports.rst index 980bc72..6fcd3b2 100644 --- a/settings/ports.rst +++ b/settings/ports.rst @@ -22,12 +22,12 @@ Emulated device to connect to the given parallel (LPT) port. * Printed pages are saved as .png files in the ``printer`` subdirectory found in the emulated machine's directory. * Use the **EPSON LQ-2500** printer driver for best results. - * This printer will not work if the included ``freetype.dll`` file is missing from the 86Box directory. + * This printer will not work on Windows hosts if the included ``freetype.dll`` file is missing from the 86Box directory. * **Generic PostScript Printer:** PostScript-compatible printer with PDF output. * Printed documents are saved as .ps files in the ``printer`` subdirectory found in the emulated machine's directory. These files are automatically converted to .pdf once printing is completed. - * The original .ps files may remain in the directory if PDF conversion fails, or if the included ``gsdll32.dll`` or ``gsdll64.dll`` file is missing from the 86Box directory. + * The original .ps files may remain in the directory if PDF conversion fails, or (on Windows hosts) if the included ``gsdll32.dll`` or ``gsdll64.dll`` file is missing from the 86Box directory. * Use the generic PostScript printer driver provided by your operating system. * Windows 95 and newer do not have a generic PostScript driver; use the **Apple LaserWriter IIf** driver for grayscale, or the **Apple Color LW 12/660 PS** driver for color. diff --git a/settings/sound.rst b/settings/sound.rst index 1721754..ce0c1ac 100644 --- a/settings/sound.rst +++ b/settings/sound.rst @@ -22,7 +22,7 @@ MIDI Out Device Device to output MIDI music to, for sound cards equipped with an external MIDI output. * **None:** don't output MIDI music. -* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured or if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory. +* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured or (Windows hosts) if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory. * **Roland MT-32**/**CM-32L Emulation:** emulate a Roland synthesizer module. Emulation is provided by the `Munt `_ library. * **System MIDI:** output to a MIDI device on the host system, such as the Windows software synthesizer or a USB MIDI adapter. diff --git a/usage/menubar.rst b/usage/menubar.rst index f5bf585..3560f5a 100644 --- a/usage/menubar.rst +++ b/usage/menubar.rst @@ -76,7 +76,7 @@ Tools * **Enable Discord integration:** enable Discord Rich Presence. 86Box shares the emulated machine's name, model and CPU with other Discord users. -.. note:: Discord integration will not be available if the Discord desktop app is not running, or if the included ``discord_game_sdk.dll`` file is missing from the 86Box directory. +.. note:: Discord integration will not be available if the Discord desktop app is not running, or (on Windows hosts) if the included ``discord_game_sdk.dll`` file is missing from the 86Box directory. * **Take screenshot:** take a screenshot of the emulated display. Screenshots are saved as .png images in the ``screenshots`` subdirectory found in the emulated machine's directory. * **Sound gain:** open the :ref:`sound gain control `, which is also accessible through the status bar. From 671c335adeb05d74d0eda8d72ffd3336e402e25f Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 16 Feb 2022 13:01:16 -0300 Subject: [PATCH 3/4] Fix FluidSynth DLL warning semantics --- settings/sound.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/sound.rst b/settings/sound.rst index ce0c1ac..844789c 100644 --- a/settings/sound.rst +++ b/settings/sound.rst @@ -22,7 +22,7 @@ MIDI Out Device Device to output MIDI music to, for sound cards equipped with an external MIDI output. * **None:** don't output MIDI music. -* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured or (Windows hosts) if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory. +* **FluidSynth:** a software soundfont synthesizer. Selecting a soundfont file is required. There will be no synthesizer output if no soundfont is configured, or (on Windows hosts) if the included ``libfluidsynth.dll`` or ``libfluidsynth64.dll`` file is missing from the 86Box directory. * **Roland MT-32**/**CM-32L Emulation:** emulate a Roland synthesizer module. Emulation is provided by the `Munt `_ library. * **System MIDI:** output to a MIDI device on the host system, such as the Windows software synthesizer or a USB MIDI adapter. From 52a18733801dd3e17dc85cf922f7d1daacfe399a Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Wed, 16 Feb 2022 13:38:04 -0300 Subject: [PATCH 4/4] Add warning about Discord on Linux non-x64 --- usage/menubar.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usage/menubar.rst b/usage/menubar.rst index 3560f5a..b616c02 100644 --- a/usage/menubar.rst +++ b/usage/menubar.rst @@ -76,7 +76,7 @@ Tools * **Enable Discord integration:** enable Discord Rich Presence. 86Box shares the emulated machine's name, model and CPU with other Discord users. -.. note:: Discord integration will not be available if the Discord desktop app is not running, or (on Windows hosts) if the included ``discord_game_sdk.dll`` file is missing from the 86Box directory. +.. note:: Discord integration will not be available if the Discord desktop app is not running, if (on Windows hosts) the included ``discord_game_sdk.dll`` file is missing from the 86Box directory, or (on Linux hosts) non-x86_64 builds. * **Take screenshot:** take a screenshot of the emulated display. Screenshots are saved as .png images in the ``screenshots`` subdirectory found in the emulated machine's directory. * **Sound gain:** open the :ref:`sound gain control `, which is also accessible through the status bar.