diff --git a/docs/docs/partials/introduction.md b/docs/docs/partials/introduction.md index f252024c7..af915d86f 100644 --- a/docs/docs/partials/introduction.md +++ b/docs/docs/partials/introduction.md @@ -32,7 +32,7 @@ obs-websocket provides a feature-rich RPC communication protocol, giving access - Abstraction of identification, events, requests, and batch requests into dedicated message types - Conformity of request naming using similar terms like `Get`, `Set`, `Get[x]List`, `Start[x]`, `Toggle[x]` - Conformity of OBS data field names like `sourceName`, `sourceKind`, `sourceType`, `sceneName`, `sceneItemName` -- Error code response system - integer corrosponds to type of error, with optional comment +- Error code response system - integer corresponds to type of error, with optional comment - Possible support for multiple message encoding options: JSON and MessagePack - PubSub system - Allow clients to specify which events they do or don't want to receive from OBS - RPC versioning - Client and server negotiate the latest version of the obs-websocket protocol to communicate with. @@ -255,7 +255,7 @@ Authentication is not required - Sent from: obs-websocket - Sent to: All subscribed and identified clients -- Description: An event coming from OBS has occured. Eg scene switched, source muted. +- Description: An event coming from OBS has occurred. Eg scene switched, source muted. **Data Keys:** diff --git a/src/eventhandler/EventHandler.cpp b/src/eventhandler/EventHandler.cpp index 05e46ab6f..03f1bc6e1 100644 --- a/src/eventhandler/EventHandler.cpp +++ b/src/eventhandler/EventHandler.cpp @@ -500,7 +500,7 @@ void EventHandler::SourceCreatedMultiHandler(void *param, calldata_t *data) } } -// Only called for destruction of a public sourcs +// Only called for destruction of a public source // Used as a fallback if an input/scene is not explicitly removed void EventHandler::SourceDestroyedMultiHandler(void *param, calldata_t *data) { diff --git a/src/eventhandler/EventHandler_Scenes.cpp b/src/eventhandler/EventHandler_Scenes.cpp index 9dc221100..c65bed3d7 100644 --- a/src/eventhandler/EventHandler_Scenes.cpp +++ b/src/eventhandler/EventHandler_Scenes.cpp @@ -133,7 +133,7 @@ void EventHandler::HandleCurrentPreviewSceneChanged() { OBSSourceAutoRelease currentPreviewScene = obs_frontend_get_current_preview_scene(); - // This event may be called when OBS is not in studio mode, however retreiving the source while not in studio mode will return null. + // This event may be called when OBS is not in studio mode, however retrieving the source while not in studio mode will return null. if (!currentPreviewScene) return; diff --git a/src/eventhandler/types/EventSubscription.h b/src/eventhandler/types/EventSubscription.h index e996bddf0..c358bddaa 100644 --- a/src/eventhandler/types/EventSubscription.h +++ b/src/eventhandler/types/EventSubscription.h @@ -22,7 +22,7 @@ with this program. If not, see namespace EventSubscription { enum EventSubscription { /** - * Subcription value used to disable all events. + * Subscription value used to disable all events. * * @enumIdentifier None * @enumValue 0 diff --git a/src/forms/ConnectInfo.cpp b/src/forms/ConnectInfo.cpp index 06507a6f9..5e6add9e5 100644 --- a/src/forms/ConnectInfo.cpp +++ b/src/forms/ConnectInfo.cpp @@ -51,7 +51,7 @@ void ConnectInfo::RefreshData() { auto conf = GetConfig(); if (!conf) { - blog(LOG_ERROR, "[ConnectInfo::showEvent] Unable to retreive config!"); + blog(LOG_ERROR, "[ConnectInfo::showEvent] Unable to retrieve config!"); return; } diff --git a/src/forms/SettingsDialog.cpp b/src/forms/SettingsDialog.cpp index eaf2027e2..30fc5fc02 100644 --- a/src/forms/SettingsDialog.cpp +++ b/src/forms/SettingsDialog.cpp @@ -79,7 +79,7 @@ void SettingsDialog::showEvent(QShowEvent *) { auto conf = GetConfig(); if (!conf) { - blog(LOG_ERROR, "[SettingsDialog::showEvent] Unable to retreive config!"); + blog(LOG_ERROR, "[SettingsDialog::showEvent] Unable to retrieve config!"); return; } @@ -119,7 +119,7 @@ void SettingsDialog::RefreshData() { auto conf = GetConfig(); if (!conf) { - blog(LOG_ERROR, "[SettingsDialog::RefreshData] Unable to retreive config!"); + blog(LOG_ERROR, "[SettingsDialog::RefreshData] Unable to retrieve config!"); return; } @@ -149,7 +149,7 @@ void SettingsDialog::SaveFormData() { auto conf = GetConfig(); if (!conf) { - blog(LOG_ERROR, "[SettingsDialog::SaveFormData] Unable to retreive config!"); + blog(LOG_ERROR, "[SettingsDialog::SaveFormData] Unable to retrieve config!"); return; } diff --git a/src/utils/Compat.h b/src/utils/Compat.h index 087d76c2e..d749715b8 100644 --- a/src/utils/Compat.h +++ b/src/utils/Compat.h @@ -24,7 +24,7 @@ with this program. If not, see namespace Utils { namespace Compat { - // Reimplement QRunnable for std::function. Retrocompatability for Qt < 5.15 + // Reimplement QRunnable for std::function. Retrocompatibility for Qt < 5.15 class StdFunctionRunnable : public QRunnable { std::function cb; diff --git a/src/websocketserver/WebSocketServer.cpp b/src/websocketserver/WebSocketServer.cpp index bd1bc3c6e..dff525375 100644 --- a/src/websocketserver/WebSocketServer.cpp +++ b/src/websocketserver/WebSocketServer.cpp @@ -78,7 +78,7 @@ void WebSocketServer::Start() auto conf = GetConfig(); if (!conf) { - blog(LOG_ERROR, "[WebSocketServer::Start] Unable to retreive config!"); + blog(LOG_ERROR, "[WebSocketServer::Start] Unable to retrieve config!"); return; } @@ -222,7 +222,7 @@ void WebSocketServer::onOpen(websocketpp::connection_hdl hdl) auto conf = GetConfig(); if (!conf) { - blog(LOG_ERROR, "[WebSocketServer::onOpen] Unable to retreive config!"); + blog(LOG_ERROR, "[WebSocketServer::onOpen] Unable to retrieve config!"); return; } @@ -330,7 +330,7 @@ void WebSocketServer::onClose(websocketpp::connection_hdl hdl) // Get config for tray notification auto conf = GetConfig(); if (!conf) { - blog(LOG_ERROR, "[WebSocketServer::onClose] Unable to retreive config!"); + blog(LOG_ERROR, "[WebSocketServer::onClose] Unable to retrieve config!"); return; }