jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Remove reset-timestamp option 

Co-Authored-By: Norihiro Kamae <780600+norihiro@users.noreply.github.com>
master
gxalpha 2022-08-31 00:39:31 +02:00 committed by Ryan Foster
parent 776ff4f5ee
commit 9dc05b6b8c
5 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/data/locale/en-US.ini
View File

@ -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"

11
UI/forms/OBSBasicSettings.ui
View File

@ -3018,16 +3018,6 @@
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QCheckBox" name="advOutSplitFileRstTS">
<property name="text">
<string>Basic.Settings.Output.SplitFile.ResetTimestamps</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -7573,7 +7563,6 @@
<tabstop>advOutSplitFileType</tabstop>
<tabstop>advOutSplitFileTime</tabstop>
<tabstop>advOutSplitFileSize</tabstop>
<tabstop>advOutSplitFileRstTS</tabstop>
<tabstop>advOutTrack1Bitrate</tabstop>
<tabstop>advOutTrack1Name</tabstop>
<tabstop>advOutTrack2Bitrate</tabstop>

7
UI/window-basic-main-outputs.cpp
View File

@ -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);

2
UI/window-basic-main.cpp
View File

@ -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);

7
UI/window-basic-settings.cpp
View File

@ -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()