ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fh/limitfps-option'

This commit is contained in:
Flyinghead 2019-05-21 11:42:07 +02:00
parent a17b8355e5 4cfcf2ea83
commit 3bf32f5adf
5 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/nullDC.cpp
View File

@ -499,7 +499,7 @@ void InitSettings()
settings.dreamcast.language = 6; // default
settings.dreamcast.FullMMU = false;
settings.dynarec.SmcCheckLevel = FullCheck;
settings.aica.LimitFPS = true;
settings.aica.LimitFPS = LimitFPSEnabled;
settings.aica.NoBatch = false; // This also controls the DSP. Disabled by default
settings.aica.NoSound = false;
settings.audio.backend = "auto";
@ -581,7 +581,7 @@ void LoadSettings(bool game_specific)
settings.dreamcast.broadcast = cfgLoadInt(config_section, "Dreamcast.Broadcast", settings.dreamcast.broadcast);
settings.dreamcast.language = cfgLoadInt(config_section, "Dreamcast.Language", settings.dreamcast.language);
settings.dreamcast.FullMMU = cfgLoadBool(config_section, "Dreamcast.FullMMU", settings.dreamcast.FullMMU);
settings.aica.LimitFPS = cfgLoadBool(config_section, "aica.LimitFPS", settings.aica.LimitFPS);
settings.aica.LimitFPS = (LimitFPSEnum)cfgLoadInt(config_section, "aica.LimitFPS", (int)settings.aica.LimitFPS);
settings.aica.NoBatch = cfgLoadBool(config_section, "aica.NoBatch", settings.aica.NoBatch);
settings.aica.NoSound = cfgLoadBool(config_section, "aica.NoSound", settings.aica.NoSound);
settings.audio.backend = cfgLoadStr(audio_section, "backend", settings.audio.backend.c_str());
@ -719,7 +719,7 @@ void SaveSettings()
cfgSaveInt("config", "Dynarec.SmcCheckLevel", (int)settings.dynarec.SmcCheckLevel);
cfgSaveInt("config", "Dreamcast.Language", settings.dreamcast.language);
cfgSaveBool("config", "aica.LimitFPS", settings.aica.LimitFPS);
cfgSaveInt("config", "aica.LimitFPS", (int)settings.aica.LimitFPS);
cfgSaveBool("config", "aica.NoBatch", settings.aica.NoBatch);
cfgSaveBool("config", "aica.NoSound", settings.aica.NoSound);
cfgSaveStr("audio", "backend", settings.audio.backend.c_str());

21
core/oslib/audiobackend_alsa.cpp
View File

@ -159,30 +159,13 @@ static u32 alsa_push(void* frame, u32 samples, bool wait)
if (rc == -EPIPE)
{
/* EPIPE means underrun */
fprintf(stderr, "ALSA: underrun occurred\n");
snd_pcm_prepare(handle);
// Write some silence then our samples
const size_t silence_size = period_size * 4;
void *silence = alloca(silence_size * 4);
memset(silence, 0, silence_size * 4);
rc = snd_pcm_writei(handle, silence, silence_size);
if (rc < 0)
fprintf(stderr, "ALSA: error from writei(silence): %s\n", snd_strerror(rc));
else if (rc < silence_size)
fprintf(stderr, "ALSA: short write from writei(silence): %d/%ld frames\n", rc, silence_size);
rc = snd_pcm_writei(handle, frame, samples);
if (rc < 0)
fprintf(stderr, "ALSA: error from writei(again): %s\n", snd_strerror(rc));
else if (rc < samples)
fprintf(stderr, "ALSA: short write from writei(again): %d/%d frames\n", rc, samples);
}
else if (rc < 0)
{
fprintf(stderr, "ALSA: error from writei: %s\n", snd_strerror(rc));
}
else if (rc != samples)
{
fprintf(stderr, "ALSA: short write, wrote %d frames of %d\n", rc, samples);
snd_pcm_writei(handle, silence, silence_size);
snd_pcm_writei(handle, frame, samples);
}
return 1;
}

3
core/oslib/audiostream.cpp
View File

@ -150,7 +150,8 @@ void WriteSample(s16 r, s16 l)
if (WritePtr==(SAMPLE_COUNT-1))
{
bool do_wait = settings.aica.LimitFPS && (mspdf <= 11);
bool do_wait = settings.aica.LimitFPS == LimitFPSEnabled
|| (settings.aica.LimitFPS == LimitFPSAuto && mspdf <= 11);
PushAudio(RingBuffer,SAMPLE_COUNT, do_wait);
}

47
core/rend/gui.cpp
View File

@ -1054,9 +1054,28 @@ static void gui_display_settings()
ImGui::Checkbox("Enable DSP", &settings.aica.NoBatch);
ImGui::SameLine();
ShowHelpMarker("Enable the Dreamcast Digital Sound Processor. Only recommended on fast and arm64 platforms");
ImGui::Checkbox("Limit FPS", &settings.aica.LimitFPS);
ImGui::SameLine();
ShowHelpMarker("Use the sound output to limit the speed of the emulator. Recommended in most cases");
const char *preview = settings.aica.LimitFPS == LimitFPSDisabled ? "Disabled" : settings.aica.LimitFPS == LimitFPSAuto ? "Automatic" : "Enabled";
if (ImGui::BeginCombo("Limit Emulator Speed", preview, ImGuiComboFlags_None))
{
bool is_selected = settings.aica.LimitFPS == LimitFPSDisabled;
if (ImGui::Selectable("Disabled", &is_selected))
settings.aica.LimitFPS = LimitFPSDisabled;
if (is_selected)
ImGui::SetItemDefaultFocus();
is_selected = settings.aica.LimitFPS == LimitFPSAuto;
if (ImGui::Selectable("Automatic", &is_selected))
settings.aica.LimitFPS = LimitFPSAuto;
if (is_selected)
ImGui::SetItemDefaultFocus();
is_selected = settings.aica.LimitFPS == LimitFPSEnabled;
if (ImGui::Selectable("Enabled", &is_selected))
settings.aica.LimitFPS = LimitFPSEnabled;
if (is_selected)
ImGui::SetItemDefaultFocus();
ImGui::EndCombo();
}
ImGui::SameLine();
ShowHelpMarker("Whether to limit the emulator speed using the audio output. Enabled recommended");
audiobackend_t* backend = NULL;;
std::string backend_name = settings.audio.backend;
@ -1070,19 +1089,15 @@ static void gui_display_settings()
SortAudioBackends();
audiobackend_t* current_backend = backend;
if (ImGui::BeginCombo("Audio Backend", backend_name.c_str(), ImGuiComboFlags_None))
if (ImGui::BeginCombo("Audio Driver", backend_name.c_str(), ImGuiComboFlags_None))
{
bool is_selected = (settings.audio.backend == "auto");
if (ImGui::Selectable("auto", &is_selected))
if (ImGui::Selectable("auto - Automatic driver selection", &is_selected))
settings.audio.backend = "auto";
ImGui::SameLine(); ImGui::Text("-");
ImGui::SameLine(); ImGui::Text("Autoselect audio backend");
is_selected = (settings.audio.backend == "none");
if (ImGui::Selectable("none", &is_selected))
if (ImGui::Selectable("none - No audio driver", &is_selected))
settings.audio.backend = "none";
ImGui::SameLine(); ImGui::Text("-");
ImGui::SameLine(); ImGui::Text("No audio backend");
for (int i = 0; i < GetAudioBackendCount(); i++)
{
@ -1092,17 +1107,15 @@ static void gui_display_settings()
if (is_selected)
current_backend = backend;
if (ImGui::Selectable(backend->slug.c_str(), &is_selected))
if (ImGui::Selectable((backend->slug + " - " + backend->name).c_str(), &is_selected))
settings.audio.backend = backend->slug;
ImGui::SameLine(); ImGui::Text("-");
ImGui::SameLine(); ImGui::Text(backend->name.c_str());
if (is_selected)
ImGui::SetItemDefaultFocus();
if (is_selected)
ImGui::SetItemDefaultFocus();
}
ImGui::EndCombo();
}
ImGui::SameLine();
ShowHelpMarker("The audio backend to use");
ImGui::SameLine();
ShowHelpMarker("The audio driver to use");
if (current_backend != NULL && current_backend->get_options != NULL)
{

7
core/types.h
View File

@ -607,6 +607,11 @@ enum SmcCheckEnum {
FastCheck = 1,
NoCheck = 2
};
enum LimitFPSEnum {
LimitFPSDisabled = 0,
LimitFPSAuto = 1,
LimitFPSEnabled = 2
};
struct settings_t
{
@ -670,7 +675,7 @@ struct settings_t
{
u32 HW_mixing; //(0) -> SW , 1 -> HW , 2 -> Auto
u32 BufferSize; //In samples ,*4 for bytes (1024)
bool LimitFPS; // defaults to true
LimitFPSEnum LimitFPS;
u32 GlobalFocus; //0 -> only hwnd , (1) -> Global
u32 BufferCount; //BufferCount+2 buffers used , max 60 , default 0
u32 CDDAMute;