Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Fix deps formatting excludes

Browse Source
This commit is contained in:
tt2468
2022-07-02 05:49:57 -07:00
parent 1626ae5546
commit 4fc8a3aecc
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI/check-format.sh
View File

@ -44,7 +44,7 @@ fi
find . -type d \( \
-path ./\*build\* -o \
-path ./deps/websocketpp -o \
-path ./deps/json -o \
-path ./deps/asio -o \
-path ./deps/json \
\) -prune -false -type f -o \
-name '*.h' -or \

3
src/eventhandler/types/EventSubscription.h
View File

@ -163,7 +163,8 @@ namespace EventSubscription {
* @initialVersion 5.0.0
* @api enums
*/
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors | Ui),
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors |
Ui),
/**
* Subscription value to receive the `InputVolumeMeters` high-volume event.

7
src/forms/SettingsDialog.cpp
View File

@ -177,9 +177,10 @@ void SettingsDialog::SaveFormData()
}
}
bool needsRestart = (conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) ||
(conf->ServerPort != ui->serverPortSpinBox->value()) ||
(ui->enableAuthenticationCheckBox->isChecked() && conf->ServerPassword != ui->serverPasswordLineEdit->text());
bool needsRestart =
(conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) ||
(conf->ServerPort != ui->serverPortSpinBox->value()) ||
(ui->enableAuthenticationCheckBox->isChecked() && conf->ServerPassword != ui->serverPasswordLineEdit->text());
conf->ServerEnabled = ui->enableWebSocketServerCheckBox->isChecked();
conf->AlertsEnabled = ui->enableSystemTrayAlertsCheckBox->isChecked();