Skip to content

Commit 6aaf2f0

Browse files
authored
Simplify simplified recording settings (#1431)
* simplify simplified recording settings * clang format
1 parent 8eda81c commit 6aaf2f0

1 file changed

Lines changed: 18 additions & 13 deletions

File tree

obs-studio-server/source/nodeobs_service.cpp

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,19 +1966,24 @@ void OBS_service::updateFfmpegOutput(bool isSimpleMode, obs_output_t *output)
19661966
obs_data_set_bool(settings, "allow_spaces", !noSpace);
19671967
obs_data_set_bool(settings, "allow_overwrite", overwriteIfExists);
19681968

1969-
if (config_get_bool(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFile")) {
1970-
const char *splitFileType = config_get_string(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileType");
1971-
if (strcmp(splitFileType, "Time") == 0)
1972-
obs_data_set_int(settings, "max_time_sec",
1973-
config_get_int(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileTime") * 60);
1974-
else if (strcmp(splitFileType, "Size") == 0)
1975-
obs_data_set_int(settings, "max_size_mb",
1976-
config_get_int(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileSize"));
1977-
1978-
obs_data_set_bool(settings, "split_file", true);
1979-
1980-
obs_data_set_bool(settings, "reset_timestamps",
1981-
config_get_bool(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileResetTimestamps"));
1969+
if (!isSimpleMode) {
1970+
if (config_get_bool(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFile")) {
1971+
const char *splitFileType = config_get_string(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileType");
1972+
if (strcmp(splitFileType, "Time") == 0) {
1973+
obs_data_set_int(settings, "max_time_sec",
1974+
config_get_int(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileTime") * 60);
1975+
} else if (strcmp(splitFileType, "Size") == 0) {
1976+
obs_data_set_int(settings, "max_size_mb",
1977+
config_get_int(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileSize"));
1978+
}
1979+
1980+
obs_data_set_bool(settings, "reset_timestamps",
1981+
config_get_bool(ConfigManager::getInstance().getBasic(), "AdvOut", "RecSplitFileResetTimestamps"));
1982+
1983+
obs_data_set_bool(settings, "split_file", true);
1984+
} else {
1985+
obs_data_set_bool(settings, "split_file", false);
1986+
}
19821987
} else {
19831988
obs_data_set_bool(settings, "split_file", false);
19841989
}

0 commit comments

Comments
 (0)