joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

disable internal FluidSynth for HX-DOS build

Browse Source
This commit is contained in:
Wengier
2020-11-01 13:43:52 -05:00
parent 0b55b065d9
commit 4ca3805d0c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/windows/installer/DOSBox-X-setup.iss
View File

@@ -486,7 +486,7 @@ begin
if (Length(lineold)>0) and (Pos('=', lineold) > 1) and (CompareText(Trim(linetmp), Trim(Copy(lineold, 1, Pos('=', lineold) - 1))) = 0) then
begin
res := 1;
if not ((adv = 1) and IsTaskSelected('commonoption') and (Trim(Copy(lineold, Pos('=', lineold) + 1, Length(lineold))) = Trim(Copy(linenew, Pos('=', linenew) + 1, Length(linenew))))) then
if not ((adv = 1) and IsTaskSelected('commonoption') and ((Trim(Copy(lineold, Pos('=', lineold) + 1, Length(lineold))) = Trim(Copy(linenew, Pos('=', linenew) + 1, Length(linenew)))) or ((CompareText(Trim(linetmp), 'drive z hide files') = 0) and (Trim(Copy(lineold, Pos('=', lineold) + 1, Length(lineold))) = '/A20GATE.COM /DSXMENU.EXE /HEXMEM16.EXE /HEXMEM32.EXE /LOADROM.COM /NMITEST.COM /VESAMOED.COM /VFRCRATE.COM')))) then
FileLinesave.add(linetmp + '= ' + Trim(Copy(lineold, Pos('=', lineold) + 1, Length(lineold))));
FileLines.Delete(j);
break;

4
src/dosbox.cpp
View File

@@ -1267,7 +1267,7 @@ void DOSBOX_SetupConfigSections(void) {
const char* cputype_values[] = {"auto", "8086", "8086_prefetch", "80186", "80186_prefetch", "286", "286_prefetch", "386", "386_prefetch", "486old", "486old_prefetch", "486", "486_prefetch", "pentium", "pentium_mmx", "ppro_slow", 0};
const char* rates[] = { "44100", "48000", "32000","22050", "16000", "11025", "8000", "49716", 0 };
const char* oplrates[] = { "44100", "49716", "48000", "32000","22050", "16000", "11025", "8000", 0 };
#if C_FLUIDSYNTH || defined(WIN32)
#if C_FLUIDSYNTH || defined(WIN32) && !defined(HX_DOS)
const char* devices[] = { "default", "win32", "alsa", "oss", "coreaudio", "coremidi", "mt32", "synth", "fluidsynth", "timidity", "none", 0};
#else
const char* devices[] = { "default", "win32", "alsa", "oss", "coreaudio", "coremidi", "mt32", "timidity", "none", 0}; // FIXME: add some way to offer the actually available choices.
@@ -2715,7 +2715,7 @@ void DOSBOX_SetupConfigSections(void) {
"Otherwise, the emulation accuracy is preserved.\n"
"Default is true.");
#if C_FLUIDSYNTH || defined(WIN32)
#if C_FLUIDSYNTH || defined(WIN32) && !defined(HX_DOS)
const char *fluiddrivers[] = {"pulseaudio", "alsa", "oss", "coreaudio", "dsound", "portaudio", "sndman", "jack", "file", "default",0};
Pstring = secprop->Add_string("fluid.driver",Property::Changeable::WhenIdle,"default");
Pstring->Set_values(fluiddrivers);

4
src/gui/midi.cpp
View File

@@ -97,7 +97,7 @@ static struct {
#include "midi_mt32.h"
#endif
#if C_FLUIDSYNTH || defined(WIN32)
#if C_FLUIDSYNTH || defined(WIN32) && !defined(HX_DOS)
#include "midi_synth.h"
#endif
@@ -584,7 +584,7 @@ public:
Section_prop * section = static_cast<Section_prop *>(configuration);
const char * dev=section->Get_string("mididevice");
std::string fullconf = section->Get_string("midiconfig");
#if C_FLUIDSYNTH || defined(WIN32)
#if C_FLUIDSYNTH || defined(WIN32) && !defined(HX_DOS)
synthsamplerate = section->Get_int("samplerate");
if (synthsamplerate == 0) synthsamplerate = 44100;
#endif