From cbfeb1fdc36952292b74c3a7b669803ca86b9973 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 10 May 2017 18:47:37 +0000 Subject: [PATCH] update midconfig helplines to reflect namesupport. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4018 --- src/dosbox.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 1462fae3..a1e18dc3 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -88,7 +88,7 @@ void MPU401_Init(Section*); void PCSPEAKER_Init(Section*); void TANDYSOUND_Init(Section*); void DISNEY_Init(Section*); -void SERIAL_Init(Section*); +void SERIAL_Init(Section*); #if C_IPX @@ -186,14 +186,14 @@ increaseticks: ratio = (Bit32s)((double)ratio * (1 - ratioremoved)); /* Don't allow very high ratio which can cause us to lock as we don't scale down * for very low ratios. High ratio might result because of timing resolution */ - if (ticksScheduled >= 250 && ticksDone < 10 && ratio > 20480) + if (ticksScheduled >= 250 && ticksDone < 10 && ratio > 20480) ratio = 20480; Bit64s cmax_scaled = (Bit64s)CPU_CycleMax * (Bit64s)ratio; /* The auto cycle code seems reliable enough to disable the fast cut back code. * This should improve the fluency of complex games. - if (ratio <= 1024) + if (ratio <= 1024) new_cmax = (Bit32s)(cmax_scaled / (Bit64s)1024); - else + else */ new_cmax = (Bit32s)(1 + (CPU_CycleMax >> 1) + cmax_scaled / (Bit64s)2048); } @@ -209,7 +209,7 @@ increaseticks: ratio, ticksDone, ticksScheduled); - */ + */ /* ratios below 1% are considered to be dropouts due to temporary load imbalance, the cycles adjusting is skipped */ if (ratio>10) { @@ -300,7 +300,7 @@ static void DOSBOX_RealInit(Section * sec) { } std::string mtype(section->Get_string("machine")); - svgaCard = SVGA_None; + svgaCard = SVGA_None; machine = MCH_VGA; int10.vesa_nolfb = false; int10.vesa_oldvbe = false; @@ -361,10 +361,10 @@ void DOSBOX_Init(void) { Pstring = secprop->Add_path("captures",Property::Changeable::Always,"capture"); Pstring->Set_help("Directory where things like wave, midi, screenshot get captured."); -#if C_DEBUG +#if C_DEBUG LOG_StartUp(); #endif - + secprop->AddInitFunction(&IO_Init);//done secprop->AddInitFunction(&PAGING_Init);//done secprop->AddInitFunction(&MEM_Init);//done @@ -396,7 +396,7 @@ void DOSBOX_Init(void) { "then the scaler will be used even if the result might not be desired."); Pstring = Pmulti->GetSection()->Add_string("type",Property::Changeable::Always,"normal2x"); - const char *scalers[] = { + const char *scalers[] = { "none", "normal2x", "normal3x", #if RENDER_USE_ADVANCED_SCALERS>2 "advmame2x", "advmame3x", "advinterp2x", "advinterp3x", "hq2x", "hq3x", "2xsai", "super2xsai", "supereagle", @@ -446,7 +446,7 @@ void DOSBOX_Init(void) { Pstring->Set_values(cyclest); Pstring = Pmulti_remain->GetSection()->Add_string("parameters",Property::Changeable::Always,""); - + Pint = secprop->Add_int("cycleup",Property::Changeable::Always,10); Pint->SetMinMax(1,1000000); Pint->Set_help("Amount of cycles to decrease/increase with keycombos.(CTRL-F11/CTRL-F12)"); @@ -454,7 +454,7 @@ void DOSBOX_Init(void) { Pint = secprop->Add_int("cycledown",Property::Changeable::Always,20); Pint->SetMinMax(1,1000000); Pint->Set_help("Setting it lower than 100 will be a percentage."); - + #if C_FPU secprop->AddInitFunction(&FPU_Init); #endif @@ -488,7 +488,7 @@ void DOSBOX_Init(void) { secprop=control->AddSection_prop("midi",&MIDI_Init,true);//done secprop->AddInitFunction(&MPU401_Init,true);//done - + const char* mputypes[] = { "intelligent", "uart", "none",0}; // FIXME: add some way to offer the actually available choices. const char *devices[] = { "default", "win32", "alsa", "oss", "coreaudio", "coremidi","none", 0}; @@ -501,8 +501,8 @@ void DOSBOX_Init(void) { Pstring->Set_help("Device that will receive the MIDI data from MPU-401."); Pstring = secprop->Add_string("midiconfig",Property::Changeable::WhenIdle,""); - Pstring->Set_help("Special configuration options for the device driver. This is usually the id of the device you want to use.\n" - " or in the case of coreaudio, you can specify a soundfont here.\n" + Pstring->Set_help("Special configuration options for the device driver. This is usually the id or part of the name of the device you want to use (find the id/name with mixer/listmidi).\n" + " Or in the case of coreaudio, you can specify a soundfont here.\n" " When using a Roland MT-32 rev. 0 as midi output device, some games may require a delay in order to prevent 'buffer overflow' issues.\n" " In that case, add 'delaysysex', for example: midiconfig=2 delaysysex\n" " See the README/Manual for more details."); @@ -512,7 +512,7 @@ void DOSBOX_Init(void) { #endif secprop=control->AddSection_prop("sblaster",&SBLASTER_Init,true);//done - + const char* sbtypes[] = { "sb1", "sb2", "sbpro1", "sbpro2", "sb16", "gb", "none", 0 }; Pstring = secprop->Add_string("sbtype",Property::Changeable::WhenIdle,"sb16"); Pstring->Set_values(sbtypes); @@ -553,7 +553,7 @@ void DOSBOX_Init(void) { secprop=control->AddSection_prop("gus",&GUS_Init,true); //done - Pbool = secprop->Add_bool("gus",Property::Changeable::WhenIdle,false); + Pbool = secprop->Add_bool("gus",Property::Changeable::WhenIdle,false); Pbool->Set_help("Enable the Gravis Ultrasound emulation."); Pint = secprop->Add_int("gusrate",Property::Changeable::WhenIdle,44100); @@ -592,13 +592,13 @@ void DOSBOX_Init(void) { Pstring = secprop->Add_string("tandy",Property::Changeable::WhenIdle,"auto"); Pstring->Set_values(tandys); Pstring->Set_help("Enable Tandy Sound System emulation. For 'auto', emulation is present only if machine is set to 'tandy'."); - + Pint = secprop->Add_int("tandyrate",Property::Changeable::WhenIdle,44100); Pint->Set_values(rates); Pint->Set_help("Sample rate of the Tandy 3-Voice generation."); secprop->AddInitFunction(&DISNEY_Init,true);//done - + Pbool = secprop->Add_bool("disney",Property::Changeable::WhenIdle,true); Pbool->Set_help("Enable Disney Sound Source emulation. (Covox Voice Master and Speech Thing compatible)."); @@ -624,7 +624,7 @@ void DOSBOX_Init(void) { Pbool = secprop->Add_bool("autofire",Property::Changeable::WhenIdle,false); Pbool->Set_help("continuously fires as long as you keep the button pressed."); - + Pbool = secprop->Add_bool("swap34",Property::Changeable::WhenIdle,false); Pbool->Set_help("swap the 3rd and the 4th axis. can be useful for certain joysticks."); @@ -634,7 +634,7 @@ void DOSBOX_Init(void) { secprop=control->AddSection_prop("serial",&SERIAL_Init,true); const char* serials[] = { "dummy", "disabled", "modem", "nullmodem", "directserial",0 }; - + Pmulti_remain = secprop->Add_multiremain("serial1",Property::Changeable::WhenIdle," "); Pstring = Pmulti_remain->GetSection()->Add_string("type",Property::Changeable::WhenIdle,"dummy"); Pmulti_remain->SetValue("dummy");