claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve FluidSynth library dependency error

Browse Source
This commit is contained in:
RichardG867
2020-06-18 21:35:42 -03:00
parent 56e486b699
commit 0a6e3ee1e2
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/language.h
View File

@@ -106,6 +106,7 @@
#define IDS_2130 2130 // "Invalid configuration" #define IDS_2130 2130 // "Invalid configuration"
#define IDS_2131 2131 // LIB_NAME_FREETYPE " is required..." #define IDS_2131 2131 // LIB_NAME_FREETYPE " is required..."
#define IDS_2132 2132 // LIB_NAME_GS " is required for... #define IDS_2132 2132 // LIB_NAME_GS " is required for...
#define IDS_2133 2133 // LIB_NAME_FLUIDSYNTH " is required..."
#define IDS_4096 4096 // "Hard disk (%s)" #define IDS_4096 4096 // "Hard disk (%s)"
#define IDS_4097 4097 // "%01i:%01i" #define IDS_4097 4097 // "%01i:%01i"

2
src/sound/midi_fluidsynth.c
View File

@@ -230,7 +230,7 @@ void* fluidsynth_init(const device_t *info)
#endif #endif
if (fluidsynth_handle == NULL) if (fluidsynth_handle == NULL)
{ {
ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2080); ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2080, (wchar_t *) IDS_2133);
return NULL; return NULL;
} }

8
src/win/86Box.rc
View File

@@ -917,7 +917,7 @@ END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_2080 "Unable to initialize FluidSynth, libfluidsynth.dll is required" IDS_2080 "Unable to initialize FluidSynth"
IDS_2081 "Bus" IDS_2081 "Bus"
IDS_2082 "File" IDS_2082 "File"
IDS_2083 "C" IDS_2083 "C"
@@ -985,6 +985,12 @@ BEGIN
#define LIB_NAME_GS "libgs" #define LIB_NAME_GS "libgs"
#endif #endif
IDS_2132 LIB_NAME_GS " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files." IDS_2132 LIB_NAME_GS " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
#ifdef _WIN32
#define LIB_NAME_FLUIDSYNTH "libfluidsynth.dll"
#else
#define LIB_NAME_FLUIDSYNTH "libfluidsynth"
#endif
IDS_2133 LIB_NAME_FLUIDSYNTH " is required for FluidSynth MIDI output."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE