4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Add option to automatically record while streaming

Browse source 
Allows the ability for users to make it so recording automatically
starts when they start streaming.  Also adds the option to allow the
recording to continue when stream is stopped.

Closes jp9000/obs-studio#554
This commit is contained in:
cg2121 2016-06-16 12:59:36 -05:00 • committed by jp9000
commit 2dfb211956
5 changed files with 175 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

26
obs/window-basic-main.cpp
View file

@ -3339,6 +3339,11 @@ void OBSBasic::StartStreaming()
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
ui->streamButton->setEnabled(true);
}
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "RecordWhenStreaming");
if (recordWhenStreaming)
StartRecording();
}
void OBSBasic::StopStreaming()
@ -3352,6 +3357,13 @@ void OBSBasic::StopStreaming()
ui->profileMenu->setEnabled(true);
App()->DecrementSleepInhibition();
}
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "RecordWhenStreaming");
bool keepRecordingWhenStreamStops = config_get_bool(GetGlobalConfig(),
"BasicWindow", "KeepRecordingWhenStreamStops");
if (recordWhenStreaming && !keepRecordingWhenStreamStops)
StopRecording();
}
void OBSBasic::ForceStopStreaming()
@ -3365,6 +3377,13 @@ void OBSBasic::ForceStopStreaming()
ui->profileMenu->setEnabled(true);
App()->DecrementSleepInhibition();
}
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "RecordWhenStreaming");
bool keepRecordingWhenStreamStops = config_get_bool(GetGlobalConfig(),
"BasicWindow", "KeepRecordingWhenStreamStops");
if (recordWhenStreaming && !keepRecordingWhenStreamStops)
StopRecording();
}
void OBSBasic::StreamDelayStarting(int sec)
@ -3481,10 +3500,11 @@ void OBSBasic::StreamingStop(int code)
void OBSBasic::StartRecording()
{
SaveProject();
if (outputHandler->RecordingActive())
return;
if (!outputHandler->RecordingActive())
outputHandler->StartRecording();
SaveProject();
outputHandler->StartRecording();
}
void OBSBasic::RecordStopping()