From 7c0620b54f635f1b6c3d6022204e0efc228b1a1f Mon Sep 17 00:00:00 2001 From: Gol-D-Ace Date: Sun, 10 Mar 2019 08:31:08 +0100 Subject: [PATCH] UI: Add PAL 25 & 50 FPS as common FPS values --- UI/forms/OBSBasicSettings.ui | 10 ++++++++++ UI/window-basic-main.cpp | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui index 0aaa6a20f..37da98616 100644 --- a/UI/forms/OBSBasicSettings.ui +++ b/UI/forms/OBSBasicSettings.ui @@ -4073,6 +4073,11 @@ 24 NTSC + + + 25 PAL + + 29.97 @@ -4088,6 +4093,11 @@ 48 + + + 50 PAL + + 59.94 diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index bd439efb6..d36dc80e9 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -5693,7 +5693,7 @@ void OBSBasic::GetFPSCommon(uint32_t &num, uint32_t &den) const } else if (strcmp(val, "24 NTSC") == 0) { num = 24000; den = 1001; - } else if (strcmp(val, "25") == 0) { + } else if (strcmp(val, "25 PAL") == 0) { num = 25; den = 1; } else if (strcmp(val, "29.97") == 0) { @@ -5702,6 +5702,9 @@ void OBSBasic::GetFPSCommon(uint32_t &num, uint32_t &den) const } else if (strcmp(val, "48") == 0) { num = 48; den = 1; + } else if (strcmp(val, "50 PAL") == 0) { + num = 50; + den = 1; } else if (strcmp(val, "59.94") == 0) { num = 60000; den = 1001;