OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-08 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Disallow exiting settings with no track in advanced mode

Browse source
This commit is contained in:
gxalpha 2023-05-12 18:16:27 +02:00 committed by Ryan Foster
parent 2bc368349f
commit 4b37692939
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UI/window-basic-main-outputs.cpp
View file

@ -1806,6 +1806,10 @@ inline void AdvancedOutput::SetupRecording()
unsigned int cy = 0;
int idx = 0;
/* Hack to allow recordings without any audio tracks selected. It is no
* longer possible to select such a configuration in settings, but legacy
* configurations might still have this configured and we don't want to
* just break them. */
if (tracks == 0)
tracks = config_get_int(main->Config(), "AdvOut", "TrackIndex");

25
UI/window-basic-settings.cpp
View file

@ -3886,14 +3886,8 @@ void OBSBasicSettings::SaveOutputSettings()
SaveSpinBox(ui->advOutSplitFileTime, "AdvOut", "RecSplitFileTime");
SaveSpinBox(ui->advOutSplitFileSize, "AdvOut", "RecSplitFileSize");
config_set_int(
main->Config(), "AdvOut", "RecTracks",
(ui->advOutRecTrack1->isChecked() ? (1 << 0) : 0) |
(ui->advOutRecTrack2->isChecked() ? (1 << 1) : 0) |
(ui->advOutRecTrack3->isChecked() ? (1 << 2) : 0) |
(ui->advOutRecTrack4->isChecked() ? (1 << 3) : 0) |
(ui->advOutRecTrack5->isChecked() ? (1 << 4) : 0) |
(ui->advOutRecTrack6->isChecked() ? (1 << 5) : 0));
config_set_int(main->Config(), "AdvOut", "RecTracks",
AdvOutGetSelectedAudioTracks());
config_set_int(main->Config(), "AdvOut", "FLVTrack", CurrentFLVTrack());
@ -4237,6 +4231,10 @@ bool OBSBasicSettings::QueryAllowedToClose()
ui->advOutRecAEncoder->currentIndex() == -1 ||
ui->advOutAEncoder->currentIndex() == -1)
invalidEncoder = true;
QString format = ui->advOutRecFormat->currentData().toString();
if (AdvOutGetSelectedAudioTracks() == 0 && format != "flv")
invalidTracks = true;
}
if (invalidEncoder) {
@ -6177,6 +6175,17 @@ int OBSBasicSettings::SimpleOutGetSelectedAudioTracks()
return tracks;
}
int OBSBasicSettings::AdvOutGetSelectedAudioTracks()
{
int tracks = (ui->advOutRecTrack1->isChecked() ? (1 << 0) : 0) |
(ui->advOutRecTrack2->isChecked() ? (1 << 1) : 0) |
(ui->advOutRecTrack3->isChecked() ? (1 << 2) : 0) |
(ui->advOutRecTrack4->isChecked() ? (1 << 3) : 0) |
(ui->advOutRecTrack5->isChecked() ? (1 << 4) : 0) |
(ui->advOutRecTrack6->isChecked() ? (1 << 5) : 0);
return tracks;
}
/* Using setEditable(true) on a QComboBox when there's a custom style in use
* does not work properly, so instead completely recreate the widget, which
* seems to work fine. */

1
UI/window-basic-settings.hpp
View file

@ -376,6 +376,7 @@ private:
int CurrentFLVTrack();
int SimpleOutGetSelectedAudioTracks();
int AdvOutGetSelectedAudioTracks();
OBSService GetStream1Service();