OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add 24 NTSC as a common FPS value

Browse source
This commit is contained in:
jp9000 2017-02-06 14:55:14 -08:00
parent e1e21c01d5
commit 52784c3e79
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
UI/forms/OBSBasicSettings.ui
View file

@ -2936,8 +2936,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>800</width>
<height>69</height>
</rect>
</property>
</widget>
@ -3091,10 +3091,10 @@
<item alignment="Qt::AlignTop">
<widget class="QComboBox" name="fpsCommon">
<property name="currentText">
<string notr="true">30</string>
<string notr="true">10</string>
</property>
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<item>
<property name="text">
@ -3106,6 +3106,11 @@
<string notr="true">20</string>
</property>
</item>
<item>
<property name="text">
<string>24 NTSC</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">29.97</string>
@ -3255,8 +3260,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>818</width>
<height>697</height>
</rect>
</property>
<layout class="QFormLayout" name="hotkeyLayout">

3
UI/window-basic-main.cpp
View file

@ -4487,6 +4487,9 @@ void OBSBasic::GetFPSCommon(uint32_t &num, uint32_t &den) const
} else if (strcmp(val, "20") == 0) {
num = 20;
den = 1;
} else if (strcmp(val, "24 NTSC") == 0) {
num = 24000;
den = 1001;
} else if (strcmp(val, "25") == 0) {
num = 25;
den = 1;

2
UI/window-basic-settings.cpp
View file

@ -1192,7 +1192,7 @@ static inline void LoadFPSCommon(OBSBasic *main, Ui::OBSBasicSettings *ui)
"FPSCommon");
int idx = ui->fpsCommon->findText(val);
if (idx == -1) idx = 3;
if (idx == -1) idx = 4;
ui->fpsCommon->setCurrentIndex(idx);
}