4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve setting type consistency

Browse source
This commit is contained in:
Palana 2014-01-29 08:40:04 +01:00
commit ad4b581112
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
obs/window-basic-settings.cpp
View file

@ -223,14 +223,14 @@ static inline void LoadFPSCommon(Ui::OBSBasicSettings *ui)
static inline void LoadFPSInteger(Ui::OBSBasicSettings *ui)
{
int val = config_get_int(GetGlobalConfig(), "Video", "FPSInt");
uint32_t val = config_get_uint(GetGlobalConfig(), "Video", "FPSInt");
ui->fpsInteger->setValue(val);
}
static inline void LoadFPSFraction(Ui::OBSBasicSettings *ui)
{
int num = config_get_int(GetGlobalConfig(), "Video", "FPSNum");
int den = config_get_int(GetGlobalConfig(), "Video", "FPSDen");
uint32_t num = config_get_uint(GetGlobalConfig(), "Video", "FPSNum");
uint32_t den = config_get_uint(GetGlobalConfig(), "Video", "FPSDen");
ui->fpsNumerator->setValue(num);
ui->fpsDenominator->setValue(den);
@ -242,8 +242,9 @@ void OBSBasicSettings::LoadFPSData()
LoadFPSInteger(ui.get());
LoadFPSFraction(ui.get());
int fpsType = config_get_int(GetGlobalConfig(), "Video", "FPSType");
if (fpsType < 0 || fpsType > 2) fpsType = 0;
uint32_t fpsType = config_get_uint(GetGlobalConfig(), "Video",
"FPSType");
if (fpsType > 2) fpsType = 0;
ui->fpsType->setCurrentIndex(fpsType);
ui->fpsTypes->setCurrentIndex(fpsType);