mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

UI: Switch RecFormat to RecFormat2

Browse Source 
Commit f1223ca566
(UI: Set fragmented MP4/MOV as default for beta/rc)
changed RecFormat to RecFormat2.
This conflicts with the use of RecFormat introduced in
d18b38e784
(UI: Enable multiple audio tracks in Simple Output recording).
This fixes the issue.
An unused var is also removed.

Signed-off-by: pkv <pkv@obsproject.com>
This commit is contained in:
pkv 2023-03-26 07:07:25 +02:00 committed by Jim
parent 35f037da47
commit 5d287734a8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -834,7 +834,7 @@ void SimpleOutput::UpdateRecordingAudioSettings()
int tracks =
config_get_int(main->Config(), "SimpleOutput", "RecTracks");
const char *recFormat =
config_get_string(main->Config(), "SimpleOutput", "RecFormat");
config_get_string(main->Config(), "SimpleOutput", "RecFormat2");
const char *quality =
config_get_string(main->Config(), "SimpleOutput", "RecQuality");
bool flv = strcmp(recFormat, "flv") == 0;
@ -1024,7 +1024,7 @@ inline void SimpleOutput::SetupOutputs()
int tracks =
config_get_int(main->Config(), "SimpleOutput", "RecTracks");
const char *recFormat =
config_get_string(main->Config(), "SimpleOutput", "RecFormat");
config_get_string(main->Config(), "SimpleOutput", "RecFormat2");
bool flv = strcmp(recFormat, "flv") == 0;
if (usingRecordingPreset) {
@ -1228,7 +1228,7 @@ bool SimpleOutput::StartStreaming(obs_service_t *service)
void SimpleOutput::UpdateRecording()
{
const char *recFormat =
config_get_string(main->Config(), "SimpleOutput", "RecFormat");
config_get_string(main->Config(), "SimpleOutput", "RecFormat2");
bool flv = strcmp(recFormat, "flv") == 0;
int tracks =
config_get_int(main->Config(), "SimpleOutput", "RecTracks");
@ -1308,8 +1308,6 @@ bool SimpleOutput::ConfigureRecording(bool updateReplayBuffer)
config_get_int(main->Config(), "SimpleOutput", "RecRBSize");
int tracks =
config_get_int(main->Config(), "SimpleOutput", "RecTracks");
const char *recFormat =
config_get_string(main->Config(), "SimpleOutput", "RecFormat");
bool is_fragmented = strcmp(format, "fmp4") == 0 ||
strcmp(format, "fmov") == 0;