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

Merge pull request #468 from yogpstop/master

Browse Source 
UI: Unify activeRefs changing method
This commit is contained in:
Jim 2015-08-28 22:20:58 -07:00
commit 7e11c01e28
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
obs/window-basic-main-outputs.cpp
View File

@ -10,6 +10,7 @@ static void OBSStartStreaming(void *data, calldata_t *params)
{
BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
QMetaObject::invokeMethod(output->main, "StreamingStart");
output->activeRefs++;
UNUSED_PARAMETER(params);
}
@ -29,6 +30,7 @@ static void OBSStartRecording(void *data, calldata_t *params)
BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
QMetaObject::invokeMethod(output->main, "RecordingStart");
output->activeRefs++;
UNUSED_PARAMETER(params);
}
@ -214,7 +216,6 @@ bool SimpleOutput::StartStreaming(obs_service_t *service)
retryDelay);
if (obs_output_start(streamOutput)) {
activeRefs++;
return true;
}
@ -264,7 +265,6 @@ bool SimpleOutput::StartRecording()
obs_data_release(settings);
if (obs_output_start(fileOutput)) {
activeRefs++;
return true;
}
@ -691,7 +691,6 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service)
retryDelay);
if (obs_output_start(streamOutput)) {
activeRefs++;
return true;
}
@ -753,7 +752,6 @@ bool AdvancedOutput::StartRecording()
}
if (obs_output_start(fileOutput)) {
activeRefs++;
return true;
}