From 9dc05b6b8c335a183bbc95818a243106e164e862 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Wed, 31 Aug 2022 00:39:31 +0200 Subject: [PATCH] UI: Remove reset-timestamp option Co-Authored-By: Norihiro Kamae <780600+norihiro@users.noreply.github.com> --- UI/data/locale/en-US.ini | 1 - UI/forms/OBSBasicSettings.ui | 11 ----------- UI/window-basic-main-outputs.cpp | 7 +------ UI/window-basic-main.cpp | 2 -- UI/window-basic-settings.cpp | 7 ------- 5 files changed, 1 insertion(+), 27 deletions(-) diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index 3b37e882d..06361584c 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -1022,7 +1022,6 @@ Basic.Settings.Output.SplitFile.TypeSize="Split by Size" Basic.Settings.Output.SplitFile.TypeManual="Only split manually" Basic.Settings.Output.SplitFile.Time="Split Time" Basic.Settings.Output.SplitFile.Size="Split Size" -Basic.Settings.Output.SplitFile.ResetTimestamps="Reset timestamps at the beginning of each split file" # Screenshot Screenshot="Screenshot Output" diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui index 8eee4cf23..4552856e7 100644 --- a/UI/forms/OBSBasicSettings.ui +++ b/UI/forms/OBSBasicSettings.ui @@ -3018,16 +3018,6 @@ - - - - Basic.Settings.Output.SplitFile.ResetTimestamps - - - true - - - @@ -7573,7 +7563,6 @@ advOutSplitFileType advOutSplitFileTime advOutSplitFileSize - advOutSplitFileRstTS advOutTrack1Bitrate advOutTrack1Name advOutTrack2Bitrate diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index 1275cc0e2..1acb87815 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -1883,7 +1883,6 @@ bool AdvancedOutput::StartRecording() const char *splitFileType; int splitFileTime; int splitFileSize; - bool splitFileResetTimestamps; if (!useStreamEncoder) { if (!ffmpegOutput) { @@ -1940,9 +1939,6 @@ bool AdvancedOutput::StartRecording() "AdvOut", "RecSplitFileSize") : 0; - splitFileResetTimestamps = - config_get_bool(main->Config(), "AdvOut", - "RecSplitFileResetTimestamps"); obs_data_set_string(settings, "directory", path); obs_data_set_string(settings, "format", filenameFormat); obs_data_set_string(settings, "extension", recFormat); @@ -1954,8 +1950,7 @@ bool AdvancedOutput::StartRecording() splitFileTime * 60); obs_data_set_int(settings, "max_size_mb", splitFileSize); - obs_data_set_bool(settings, "reset_timestamps", - splitFileResetTimestamps); + obs_data_set_bool(settings, "reset_timestamps", true); } obs_output_update(fileOutput, settings); diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 066475887..a72631695 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -1437,8 +1437,6 @@ bool OBSBasic::InitBasicConfigDefaults() config_set_default_uint(basicConfig, "AdvOut", "RecSplitFileTime", 15); config_set_default_uint(basicConfig, "AdvOut", "RecSplitFileSize", 2048); - config_set_default_bool(basicConfig, "AdvOut", - "RecSplitFileResetTimestamps", true); config_set_default_bool(basicConfig, "AdvOut", "RecRB", false); config_set_default_uint(basicConfig, "AdvOut", "RecRBTime", 20); diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index a7847fd01..2c4c8a859 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -462,7 +462,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) HookWidget(ui->advOutSplitFileType, COMBO_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->advOutSplitFileTime, SCROLL_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->advOutSplitFileSize, SCROLL_CHANGED, OUTPUTS_CHANGED); - HookWidget(ui->advOutSplitFileRstTS, CHECK_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->advOutRecTrack1, CHECK_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->advOutRecTrack2, CHECK_CHANGED, OUTPUTS_CHANGED); HookWidget(ui->advOutRecTrack3, CHECK_CHANGED, OUTPUTS_CHANGED); @@ -1962,8 +1961,6 @@ void OBSBasicSettings::LoadAdvOutputRecordingSettings() config_get_int(main->Config(), "AdvOut", "RecSplitFileTime"); int splitFileSize = config_get_int(main->Config(), "AdvOut", "RecSplitFileSize"); - bool splitFileResetTimestamps = config_get_bool( - main->Config(), "AdvOut", "RecSplitFileResetTimestamps"); int typeIndex = (astrcmpi(type, "FFmpeg") == 0) ? 1 : 0; ui->advOutRecType->setCurrentIndex(typeIndex); @@ -1993,7 +1990,6 @@ void OBSBasicSettings::LoadAdvOutputRecordingSettings() ui->advOutSplitFileType->setCurrentIndex(idx); ui->advOutSplitFileTime->setValue(splitFileTime); ui->advOutSplitFileSize->setValue(splitFileSize); - ui->advOutSplitFileRstTS->setChecked(splitFileResetTimestamps); switch (flvTrack) { case 1: @@ -3586,8 +3582,6 @@ void OBSBasicSettings::SaveOutputSettings() SplitFileTypeFromIdx(ui->advOutSplitFileType->currentIndex())); SaveSpinBox(ui->advOutSplitFileTime, "AdvOut", "RecSplitFileTime"); SaveSpinBox(ui->advOutSplitFileSize, "AdvOut", "RecSplitFileSize"); - SaveCheckBox(ui->advOutSplitFileRstTS, "AdvOut", - "RecSplitFileResetTimestamps"); config_set_int( main->Config(), "AdvOut", "RecTracks", @@ -4612,7 +4606,6 @@ void OBSBasicSettings::AdvOutSplitFileChanged() ui->advOutSplitFileTime->setVisible(splitFileType == 0); ui->advOutSplitFileSizeLabel->setVisible(splitFileType == 1); ui->advOutSplitFileSize->setVisible(splitFileType == 1); - ui->advOutSplitFileRstTS->setVisible(splitFile); } void OBSBasicSettings::AdvOutRecCheckWarnings()