mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-05 07:06:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Only inhibit when active or if projector open

Browse Source 
Having sleep or screensavers inhibited at all times was causing some
annoyances for people.  Sleep/screensavers are now only inhibited when
the program is active or when a projector is open.
This commit is contained in:
jp9000
2015-11-16 09:08:55 -08:00
parent 14bfa07168
commit 34bbc444eb
5 changed files with 60 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
obs/window-basic-main.cpp
View File

@@ -924,8 +924,6 @@ void OBSBasic::OBSInit()
connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDisplay);
sleepInhibitor = os_inhibit_sleep_create("OBS Video/audio");
os_inhibit_sleep_set_active(sleepInhibitor, true);
show();
}
@@ -1178,9 +1176,6 @@ OBSBasic::~OBSBasic()
}
}
#endif
os_inhibit_sleep_set_active(sleepInhibitor, false);
os_inhibit_sleep_destroy(sleepInhibitor);
}
void OBSBasic::SaveProjectNow()
@@ -3080,8 +3075,9 @@ void OBSBasic::StopStreaming()
if (outputHandler->StreamingActive())
outputHandler->StopStreaming();
if (!outputHandler->Active()) {
if (!outputHandler->Active() && !ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(true);
App()->DecrementSleepInhibition();
}
}
@@ -3092,8 +3088,9 @@ void OBSBasic::ForceStopStreaming()
if (outputHandler->StreamingActive())
outputHandler->ForceStopStreaming();
if (!outputHandler->Active()) {
if (!outputHandler->Active() && !ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(true);
App()->DecrementSleepInhibition();
}
}
@@ -3113,6 +3110,11 @@ void OBSBasic::StreamDelayStarting(int sec)
ui->streamButton->setMenu(startStreamMenu);
ui->statusbar->StreamDelayStarting(sec);
if (ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(false);
App()->IncrementSleepInhibition();
}
}
void OBSBasic::StreamDelayStopping(int sec)
@@ -3138,7 +3140,12 @@ void OBSBasic::StreamingStart()
ui->streamButton->setText(QTStr("Basic.Main.StopStreaming"));
ui->streamButton->setEnabled(true);
ui->statusbar->StreamStarted(outputHandler->streamOutput);
ui->profileMenu->setEnabled(false);
if (ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(false);
App()->IncrementSleepInhibition();
}
blog(LOG_INFO, STREAMING_START);
}
@@ -3175,8 +3182,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->isEnabled()) {
ui->profileMenu->setEnabled(true);
App()->DecrementSleepInhibition();
}
blog(LOG_INFO, STREAMING_STOP);
@@ -3207,8 +3216,9 @@ void OBSBasic::StopRecording()
if (outputHandler->RecordingActive())
outputHandler->StopRecording();
if (!outputHandler->Active()) {
if (!outputHandler->Active() && !ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(true);
App()->DecrementSleepInhibition();
}
}
@@ -3216,7 +3226,12 @@ void OBSBasic::RecordingStart()
{
ui->statusbar->RecordingStarted(outputHandler->fileOutput);
ui->recordButton->setText(QTStr("Basic.Main.StopRecording"));
ui->profileMenu->setEnabled(false);
if (ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(false);
App()->IncrementSleepInhibition();
}
blog(LOG_INFO, RECORDING_START);
}
@@ -3242,8 +3257,9 @@ void OBSBasic::RecordingStop(int code)
QTStr("Output.RecordError.Msg"));
}
if (!outputHandler->Active()) {
if (!outputHandler->Active() && !ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(true);
App()->DecrementSleepInhibition();
}
}