diff --git a/CMakeLists.txt b/CMakeLists.txt index 74183b4d..81a8ddfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ set(obs-websocket_SOURCES src/utils/Obs_StringHelper.cpp src/utils/Obs_EnumHelper.cpp src/utils/Obs_NumberHelper.cpp - src/utils/Obs_ListHelper.cpp + src/utils/Obs_ArrayHelper.cpp src/utils/Obs_ObjectHelper.cpp src/utils/Obs_SearchHelper.cpp src/utils/Obs_ActionHelper.cpp diff --git a/src/eventhandler/EventHandler_Config.cpp b/src/eventhandler/EventHandler_Config.cpp index 8082ecba..d93bc621 100644 --- a/src/eventhandler/EventHandler_Config.cpp +++ b/src/eventhandler/EventHandler_Config.cpp @@ -80,7 +80,7 @@ void EventHandler::HandleCurrentSceneCollectionChanged() void EventHandler::HandleSceneCollectionListChanged() { json eventData; - eventData["sceneCollections"] = Utils::Obs::ListHelper::GetSceneCollectionList(); + eventData["sceneCollections"] = Utils::Obs::ArrayHelper::GetSceneCollectionList(); BroadcastEvent(EventSubscription::Config, "SceneCollectionListChanged", eventData); } @@ -140,6 +140,6 @@ void EventHandler::HandleCurrentProfileChanged() void EventHandler::HandleProfileListChanged() { json eventData; - eventData["profiles"] = Utils::Obs::ListHelper::GetProfileList(); + eventData["profiles"] = Utils::Obs::ArrayHelper::GetProfileList(); BroadcastEvent(EventSubscription::Config, "ProfileListChanged", eventData); } diff --git a/src/eventhandler/EventHandler_SceneItems.cpp b/src/eventhandler/EventHandler_SceneItems.cpp index d570dcef..ca0ed9ab 100644 --- a/src/eventhandler/EventHandler_SceneItems.cpp +++ b/src/eventhandler/EventHandler_SceneItems.cpp @@ -70,7 +70,7 @@ void EventHandler::HandleSceneItemListReindexed(void *param, calldata_t *data) json eventData; eventData["sceneName"] = obs_source_get_name(obs_scene_get_source(scene)); - eventData["sceneItems"] = Utils::Obs::ListHelper::GetSceneItemList(scene, true); + eventData["sceneItems"] = Utils::Obs::ArrayHelper::GetSceneItemList(scene, true); eventHandler->BroadcastEvent(EventSubscription::SceneItems, "SceneItemListReindexed", eventData); } diff --git a/src/eventhandler/EventHandler_Scenes.cpp b/src/eventhandler/EventHandler_Scenes.cpp index 05c0f587..d8aee383 100644 --- a/src/eventhandler/EventHandler_Scenes.cpp +++ b/src/eventhandler/EventHandler_Scenes.cpp @@ -68,6 +68,6 @@ void EventHandler::HandleCurrentPreviewSceneChanged() void EventHandler::HandleSceneListChanged() { json eventData; - eventData["scenes"] = Utils::Obs::ListHelper::GetSceneList(); + eventData["scenes"] = Utils::Obs::ArrayHelper::GetSceneList(); BroadcastEvent(EventSubscription::Scenes, "SceneListChanged", eventData); } diff --git a/src/requesthandler/RequestHandler_Config.cpp b/src/requesthandler/RequestHandler_Config.cpp index 0cf7fe87..40e0938a 100644 --- a/src/requesthandler/RequestHandler_Config.cpp +++ b/src/requesthandler/RequestHandler_Config.cpp @@ -124,7 +124,7 @@ RequestResult RequestHandler::GetSceneCollectionList(const Request&) { json responseData; responseData["currentSceneCollectionName"] = Utils::Obs::StringHelper::GetCurrentSceneCollection(); - responseData["sceneCollections"] = Utils::Obs::ListHelper::GetSceneCollectionList(); + responseData["sceneCollections"] = Utils::Obs::ArrayHelper::GetSceneCollectionList(); return RequestResult::Success(responseData); } @@ -151,7 +151,7 @@ RequestResult RequestHandler::SetCurrentSceneCollection(const Request& request) std::string sceneCollectionName = request.RequestData["sceneCollectionName"]; - auto sceneCollections = Utils::Obs::ListHelper::GetSceneCollectionList(); + auto sceneCollections = Utils::Obs::ArrayHelper::GetSceneCollectionList(); if (std::find(sceneCollections.begin(), sceneCollections.end(), sceneCollectionName) == sceneCollections.end()) return RequestResult::Error(RequestStatus::ResourceNotFound); @@ -189,7 +189,7 @@ RequestResult RequestHandler::CreateSceneCollection(const Request& request) std::string sceneCollectionName = request.RequestData["sceneCollectionName"]; - auto sceneCollections = Utils::Obs::ListHelper::GetSceneCollectionList(); + auto sceneCollections = Utils::Obs::ArrayHelper::GetSceneCollectionList(); if (std::find(sceneCollections.begin(), sceneCollections.end(), sceneCollectionName) != sceneCollections.end()) return RequestResult::Error(RequestStatus::ResourceAlreadyExists); @@ -219,7 +219,7 @@ RequestResult RequestHandler::GetProfileList(const Request&) { json responseData; responseData["currentProfileName"] = Utils::Obs::StringHelper::GetCurrentProfile(); - responseData["profiles"] = Utils::Obs::ListHelper::GetProfileList(); + responseData["profiles"] = Utils::Obs::ArrayHelper::GetProfileList(); return RequestResult::Success(responseData); } @@ -244,7 +244,7 @@ RequestResult RequestHandler::SetCurrentProfile(const Request& request) std::string profileName = request.RequestData["profileName"]; - auto profiles = Utils::Obs::ListHelper::GetProfileList(); + auto profiles = Utils::Obs::ArrayHelper::GetProfileList(); if (std::find(profiles.begin(), profiles.end(), profileName) == profiles.end()) return RequestResult::Error(RequestStatus::ResourceNotFound); @@ -280,7 +280,7 @@ RequestResult RequestHandler::CreateProfile(const Request& request) std::string profileName = request.RequestData["profileName"]; - auto profiles = Utils::Obs::ListHelper::GetProfileList(); + auto profiles = Utils::Obs::ArrayHelper::GetProfileList(); if (std::find(profiles.begin(), profiles.end(), profileName) != profiles.end()) return RequestResult::Error(RequestStatus::ResourceAlreadyExists); @@ -311,7 +311,7 @@ RequestResult RequestHandler::RemoveProfile(const Request& request) std::string profileName = request.RequestData["profileName"]; - auto profiles = Utils::Obs::ListHelper::GetProfileList(); + auto profiles = Utils::Obs::ArrayHelper::GetProfileList(); if (std::find(profiles.begin(), profiles.end(), profileName) == profiles.end()) return RequestResult::Error(RequestStatus::ResourceNotFound); diff --git a/src/requesthandler/RequestHandler_General.cpp b/src/requesthandler/RequestHandler_General.cpp index ea6afb40..53852ef5 100644 --- a/src/requesthandler/RequestHandler_General.cpp +++ b/src/requesthandler/RequestHandler_General.cpp @@ -195,7 +195,7 @@ RequestResult RequestHandler::CallVendorRequest(const Request& request) RequestResult RequestHandler::GetHotkeyList(const Request&) { json responseData; - responseData["hotkeys"] = Utils::Obs::ListHelper::GetHotkeyNameList(); + responseData["hotkeys"] = Utils::Obs::ArrayHelper::GetHotkeyNameList(); return RequestResult::Success(responseData); } diff --git a/src/requesthandler/RequestHandler_Inputs.cpp b/src/requesthandler/RequestHandler_Inputs.cpp index 3e782bd5..b29bfe1f 100644 --- a/src/requesthandler/RequestHandler_Inputs.cpp +++ b/src/requesthandler/RequestHandler_Inputs.cpp @@ -47,7 +47,7 @@ RequestResult RequestHandler::GetInputList(const Request& request) } json responseData; - responseData["inputs"] = Utils::Obs::ListHelper::GetInputList(inputKind); + responseData["inputs"] = Utils::Obs::ArrayHelper::GetInputList(inputKind); return RequestResult::Success(responseData); } @@ -79,7 +79,7 @@ RequestResult RequestHandler::GetInputKindList(const Request& request) } json responseData; - responseData["inputKinds"] = Utils::Obs::ListHelper::GetInputKindList(unversioned); + responseData["inputKinds"] = Utils::Obs::ArrayHelper::GetInputKindList(unversioned); return RequestResult::Success(responseData); } @@ -115,7 +115,7 @@ RequestResult RequestHandler::CreateInput(const Request& request) return RequestResult::Error(RequestStatus::ResourceAlreadyExists, "A source already exists by that input name."); std::string inputKind = request.RequestData["inputKind"]; - auto kinds = Utils::Obs::ListHelper::GetInputKindList(); + auto kinds = Utils::Obs::ArrayHelper::GetInputKindList(); if (std::find(kinds.begin(), kinds.end(), inputKind) == kinds.end()) return RequestResult::Error(RequestStatus::InvalidInputKind, "Your specified input kind is not supported by OBS. Check that your specified kind is properly versioned and that any necessary plugins are loaded."); diff --git a/src/requesthandler/RequestHandler_SceneItems.cpp b/src/requesthandler/RequestHandler_SceneItems.cpp index bb6a41b0..34f1958e 100644 --- a/src/requesthandler/RequestHandler_SceneItems.cpp +++ b/src/requesthandler/RequestHandler_SceneItems.cpp @@ -44,7 +44,7 @@ RequestResult RequestHandler::GetSceneItemList(const Request& request) return RequestResult::Error(statusCode, comment); json responseData; - responseData["sceneItems"] = Utils::Obs::ListHelper::GetSceneItemList(obs_scene_from_source(scene)); + responseData["sceneItems"] = Utils::Obs::ArrayHelper::GetSceneItemList(obs_scene_from_source(scene)); return RequestResult::Success(responseData); } @@ -76,7 +76,7 @@ RequestResult RequestHandler::GetGroupSceneItemList(const Request& request) return RequestResult::Error(statusCode, comment); json responseData; - responseData["sceneItems"] = Utils::Obs::ListHelper::GetSceneItemList(obs_group_from_source(scene)); + responseData["sceneItems"] = Utils::Obs::ArrayHelper::GetSceneItemList(obs_group_from_source(scene)); return RequestResult::Success(responseData); } diff --git a/src/requesthandler/RequestHandler_Scenes.cpp b/src/requesthandler/RequestHandler_Scenes.cpp index f6a3e013..9481013f 100644 --- a/src/requesthandler/RequestHandler_Scenes.cpp +++ b/src/requesthandler/RequestHandler_Scenes.cpp @@ -49,7 +49,7 @@ RequestResult RequestHandler::GetSceneList(const Request&) else responseData["currentPreviewSceneName"] = nullptr; - responseData["scenes"] = Utils::Obs::ListHelper::GetSceneList(); + responseData["scenes"] = Utils::Obs::ArrayHelper::GetSceneList(); return RequestResult::Success(responseData); } diff --git a/src/utils/Obs.h b/src/utils/Obs.h index c3e4a410..2ce8579e 100644 --- a/src/utils/Obs.h +++ b/src/utils/Obs.h @@ -111,7 +111,7 @@ namespace Utils { size_t GetSceneCount(); } - namespace ListHelper { + namespace ArrayHelper { std::vector GetSceneCollectionList(); std::vector GetProfileList(); std::vector GetHotkeyList(); diff --git a/src/utils/Obs_ListHelper.cpp b/src/utils/Obs_ArrayHelper.cpp similarity index 88% rename from src/utils/Obs_ListHelper.cpp rename to src/utils/Obs_ArrayHelper.cpp index 9a40fbd0..4b9317a6 100644 --- a/src/utils/Obs_ListHelper.cpp +++ b/src/utils/Obs_ArrayHelper.cpp @@ -40,7 +40,7 @@ static std::vector ConvertStringArray(char **array) return ret; } -std::vector Utils::Obs::ListHelper::GetSceneCollectionList() +std::vector Utils::Obs::ArrayHelper::GetSceneCollectionList() { char** sceneCollections = obs_frontend_get_scene_collections(); auto ret = ConvertStringArray(sceneCollections); @@ -48,7 +48,7 @@ std::vector Utils::Obs::ListHelper::GetSceneCollectionList() return ret; } -std::vector Utils::Obs::ListHelper::GetProfileList() +std::vector Utils::Obs::ArrayHelper::GetProfileList() { char** profiles = obs_frontend_get_profiles(); auto ret = ConvertStringArray(profiles); @@ -56,7 +56,7 @@ std::vector Utils::Obs::ListHelper::GetProfileList() return ret; } -std::vector Utils::Obs::ListHelper::GetHotkeyList() +std::vector Utils::Obs::ArrayHelper::GetHotkeyList() { std::vector ret; @@ -71,7 +71,7 @@ std::vector Utils::Obs::ListHelper::GetHotkeyList() return ret; } -std::vector Utils::Obs::ListHelper::GetHotkeyNameList() +std::vector Utils::Obs::ArrayHelper::GetHotkeyNameList() { auto hotkeys = GetHotkeyList(); @@ -82,7 +82,7 @@ std::vector Utils::Obs::ListHelper::GetHotkeyNameList() return ret; } -std::vector Utils::Obs::ListHelper::GetSceneList() +std::vector Utils::Obs::ArrayHelper::GetSceneList() { obs_frontend_source_list sceneList = {}; obs_frontend_get_scenes(&sceneList); @@ -109,7 +109,7 @@ std::vector Utils::Obs::ListHelper::GetSceneList() return ret; } -std::vector Utils::Obs::ListHelper::GetSceneItemList(obs_scene_t *scene, bool basic) +std::vector Utils::Obs::ArrayHelper::GetSceneItemList(obs_scene_t *scene, bool basic) { std::pair, bool> enumData; enumData.second = basic; @@ -143,7 +143,7 @@ std::vector Utils::Obs::ListHelper::GetSceneItemList(obs_scene_t *scene, b return enumData.first; } -std::vector Utils::Obs::ListHelper::GetTransitionList() +std::vector Utils::Obs::ArrayHelper::GetTransitionList() { obs_frontend_source_list transitionList = {}; obs_frontend_get_transitions(&transitionList); @@ -168,7 +168,7 @@ struct EnumInputInfo { std::vector inputs; }; -std::vector Utils::Obs::ListHelper::GetInputList(std::string inputKind) +std::vector Utils::Obs::ArrayHelper::GetInputList(std::string inputKind) { EnumInputInfo inputInfo; inputInfo.inputKind = inputKind; @@ -199,7 +199,7 @@ std::vector Utils::Obs::ListHelper::GetInputList(std::string inputKind) return inputInfo.inputs; } -std::vector Utils::Obs::ListHelper::GetInputKindList(bool unversioned, bool includeDisabled) +std::vector Utils::Obs::ArrayHelper::GetInputKindList(bool unversioned, bool includeDisabled) { std::vector ret; diff --git a/src/utils/Obs_SearchHelper.cpp b/src/utils/Obs_SearchHelper.cpp index 3b3e95ff..c01ef21b 100644 --- a/src/utils/Obs_SearchHelper.cpp +++ b/src/utils/Obs_SearchHelper.cpp @@ -24,7 +24,7 @@ obs_hotkey_t *Utils::Obs::SearchHelper::GetHotkeyByName(std::string name) if (name.empty()) return nullptr; - auto hotkeys = ListHelper::GetHotkeyList(); + auto hotkeys = ArrayHelper::GetHotkeyList(); for (auto hotkey : hotkeys) { if (obs_hotkey_get_name(hotkey) == name)