mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-10-20 13:04:54 -04:00
UI: Move "enforce" setting to "ignore" stream section
Moves the "Enforce streaming service bitrate" option from simple output mode to the stream section, renames it to "Ignore streaming service setting recommendations" (inverting it). When trying to check it, it will now also display a message box warning the user that it's generally a not-so-good idea. Also displays recommended settings for the service.
This commit is contained in:
1 parent
005863a346
commit
546dcc7a14
7 files changed
+159
-68
No files matched your search
@@ -1266,6 +1266,22 @@ bool OBSBasic::InitBasicConfigDefaults()
|
||||
changed = true;
|
||||
}
|
||||
|
||||
/* ----------------------------------------------------- */
|
||||
/* move bitrate enforcement setting to new value */
|
||||
if (config_has_user_value(basicConfig, "SimpleOutput",
|
||||
"EnforceBitrate") &&
|
||||
!config_has_user_value(basicConfig, "Stream1",
|
||||
"IgnoreRecommended") &&
|
||||
!config_has_user_value(basicConfig, "Stream1", "MovedOldEnforce")) {
|
||||
bool enforce = config_get_bool(basicConfig, "SimpleOutput",
|
||||
"EnforceBitrate");
|
||||
config_set_bool(basicConfig, "Stream1", "IgnoreRecommended",
|
||||
!enforce);
|
||||
config_set_bool(basicConfig, "Stream1", "MovedOldEnforce",
|
||||
true);
|
||||
changed = true;
|
||||
}
|
||||
|
||||
/* ----------------------------------------------------- */
|
||||
|
||||
if (changed)
|
||||
@@ -1275,6 +1291,9 @@ bool OBSBasic::InitBasicConfigDefaults()
|
||||
|
||||
config_set_default_string(basicConfig, "Output", "Mode", "Simple");
|
||||
|
||||
config_set_default_bool(basicConfig, "Stream1", "IgnoreRecommended",
|
||||
false);
|
||||
|
||||
config_set_default_string(basicConfig, "SimpleOutput", "FilePath",
|
||||
GetDefaultVideoSavePath().c_str());
|
||||
config_set_default_string(basicConfig, "SimpleOutput", "RecFormat",
|
||||
@@ -1283,8 +1302,6 @@ bool OBSBasic::InitBasicConfigDefaults()
|
||||
config_set_default_uint(basicConfig, "SimpleOutput", "ABitrate", 160);
|
||||
config_set_default_bool(basicConfig, "SimpleOutput", "UseAdvanced",
|
||||
false);
|
||||
config_set_default_bool(basicConfig, "SimpleOutput", "EnforceBitrate",
|
||||
true);
|
||||
config_set_default_string(basicConfig, "SimpleOutput", "Preset",
|
||||
"veryfast");
|
||||
config_set_default_string(basicConfig, "SimpleOutput", "NVENCPreset",
|
||||
|
||||
Reference in new issue
Block a user