OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix stream/recording startup/stop logging

Browse source 
I actually made the mistake of making these messages only display if all
outputs were no longer active.
This commit is contained in:
jp9000 2015-07-05 23:48:29 -07:00
parent 64d9dd77e7
commit a0e42ff277
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2920,9 +2920,6 @@ void OBSBasic::StartStreaming()
{
SaveProject();
if (!outputHandler->Active())
blog(LOG_INFO, STREAMING_START);
if (outputHandler->StreamingActive())
return;
@ -2951,6 +2948,7 @@ void OBSBasic::StreamingStart()
ui->streamButton->setEnabled(true);
ui->statusbar->StreamStarted(outputHandler->streamOutput);
ui->profileMenu->setEnabled(false);
blog(LOG_INFO, STREAMING_START);
}
void OBSBasic::StreamingStop(int code)
@ -2986,10 +2984,10 @@ void OBSBasic::StreamingStop(int code)
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
ui->streamButton->setEnabled(true);
if (!outputHandler->Active()) {
if (!outputHandler->Active())
ui->profileMenu->setEnabled(true);
blog(LOG_INFO, STREAMING_STOP);
}
blog(LOG_INFO, STREAMING_STOP);
if (code != OBS_OUTPUT_SUCCESS)
QMessageBox::information(this,
@ -3001,9 +2999,6 @@ void OBSBasic::StartRecording()
{
SaveProject();
if (!outputHandler->Active())
blog(LOG_INFO, RECORDING_START);
if (!outputHandler->RecordingActive())
outputHandler->StartRecording();
}
@ -3017,7 +3012,6 @@ void OBSBasic::StopRecording()
if (!outputHandler->Active()) {
ui->profileMenu->setEnabled(true);
blog(LOG_INFO, RECORDING_STOP);
}
}
@ -3026,12 +3020,14 @@ void OBSBasic::RecordingStart()
ui->statusbar->RecordingStarted(outputHandler->fileOutput);
ui->recordButton->setText(QTStr("Basic.Main.StopRecording"));
ui->profileMenu->setEnabled(false);
blog(LOG_INFO, RECORDING_START);
}
void OBSBasic::RecordingStop(int code)
{
ui->statusbar->RecordingStopped();
ui->recordButton->setText(QTStr("Basic.Main.StartRecording"));
blog(LOG_INFO, RECORDING_STOP);
if (code == OBS_OUTPUT_UNSUPPORTED)
QMessageBox::information(this,
@ -3040,7 +3036,6 @@ void OBSBasic::RecordingStop(int code)
if (!outputHandler->Active()) {
ui->profileMenu->setEnabled(true);
blog(LOG_INFO, RECORDING_STOP);
}
}