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

UI: Show video container warning when selecting MOV

Browse Source 
MOV and MP4 are closely related and the warning message applies to both
of these container formats.

Closes #1683
This commit is contained in:
derrod
2019-02-24 05:12:37 +01:00
committed by Colin Edwards
parent 0f8c405e15
commit 89fbc5449e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -876,7 +876,7 @@ SceneItemHide="Hide '%1'"
# Output warnings
OutputWarnings.NoTracksSelected="You must select at least one track"
OutputWarnings.MultiTrackRecording="Warning: Certain formats (such as FLV) do not support multiple tracks per recording"
OutputWarnings.MP4Recording="Warning: Recordings saved to MP4 will be unrecoverable if the file cannot be finalized (e.g. as a result of BSODs, power losses, etc.). If you want to record multiple audio tracks consider using MKV and remux the recording to mp4 after it is finished (File->Remux Recordings)"
OutputWarnings.MP4Recording="Warning: Recordings saved to MP4/MOV will be unrecoverable if the file cannot be finalized (e.g. as a result of BSODs, power losses, etc.). If you want to record multiple audio tracks consider using MKV and remux the recording to MP4/MOV after it is finished (File->Remux Recordings)"
# deleting final scene
FinalScene.Title="Delete Scene"

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

@@ -3888,7 +3888,8 @@ void OBSBasicSettings::AdvOutRecCheckWarnings()
warningMsg = QTStr("OutputWarnings.MultiTrackRecording");
}
if (ui->advOutRecFormat->currentText().compare("mp4") == 0) {
if (ui->advOutRecFormat->currentText().compare("mp4") == 0 ||
ui->advOutRecFormat->currentText().compare("mov") == 0) {
if (!warningMsg.isEmpty())
warningMsg += "\n\n";
warningMsg += QTStr("OutputWarnings.MP4Recording");
@@ -4347,7 +4348,8 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged()
}
}
if (ui->simpleOutRecFormat->currentText().compare("mp4") == 0) {
if (ui->simpleOutRecFormat->currentText().compare("mp4") == 0 ||
ui->simpleOutRecFormat->currentText().compare("mov") == 0) {
if (!warning.isEmpty())
warning += "\n\n";
warning += QTStr("OutputWarnings.MP4Recording");