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

Utils: Rename DataHelper to ObjectHelper

Browse Source
This commit is contained in:
tt2468 2021-12-18 21:50:00 -08:00
parent f66080a031
commit 5cd1af426a
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -127,7 +127,7 @@ set(obs-websocket_SOURCES
src/utils/Obs_EnumHelper.cpp
src/utils/Obs_NumberHelper.cpp
src/utils/Obs_ListHelper.cpp
src/utils/Obs_DataHelper.cpp
src/utils/Obs_ObjectHelper.cpp
src/utils/Obs_SearchHelper.cpp
src/utils/Obs_ActionHelper.cpp
src/utils/ObsVolumeMeter.cpp

2
src/eventhandler/EventHandler_SceneItems.cpp
View File

@ -134,6 +134,6 @@ void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data
json eventData;
eventData["sceneName"] = obs_source_get_name(obs_scene_get_source(scene));
eventData["sceneItemId"] = obs_sceneitem_get_id(sceneItem);
eventData["sceneItemTransform"] = Utils::Obs::DataHelper::GetSceneItemTransform(sceneItem);
eventData["sceneItemTransform"] = Utils::Obs::ObjectHelper::GetSceneItemTransform(sceneItem);
eventHandler->BroadcastEvent(EventSubscription::SceneItemTransformChanged, "SceneItemTransformChanged", eventData);
}

2
src/requesthandler/RequestHandler_General.cpp
View File

@ -84,7 +84,7 @@ RequestResult RequestHandler::GetVersion(const Request&)
*/
RequestResult RequestHandler::GetStats(const Request&)
{
json responseData = Utils::Obs::DataHelper::GetStats();
json responseData = Utils::Obs::ObjectHelper::GetStats();
responseData["webSocketSessionIncomingMessages"] = _session->IncomingMessages();
responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages();

2
src/requesthandler/RequestHandler_SceneItems.cpp
View File

@ -293,7 +293,7 @@ RequestResult RequestHandler::GetSceneItemTransform(const Request& request)
return RequestResult::Error(statusCode, comment);
json responseData;
responseData["sceneItemTransform"] = Utils::Obs::DataHelper::GetSceneItemTransform(sceneItem);
responseData["sceneItemTransform"] = Utils::Obs::ObjectHelper::GetSceneItemTransform(sceneItem);
return RequestResult::Success(responseData);
}

2
src/utils/Obs.h
View File

@ -123,7 +123,7 @@ namespace Utils {
std::vector<std::string> GetInputKindList(bool unversioned = false, bool includeDisabled = false);
}
namespace DataHelper {
namespace ObjectHelper {
json GetStats();
json GetSceneItemTransform(obs_sceneitem_t *item);
}

4
src/utils/Obs_DataHelper.cpp → src/utils/Obs_ObjectHelper.cpp
View File

@ -23,7 +23,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include "../obs-websocket.h"
#include "../plugin-macros.generated.h"
json Utils::Obs::DataHelper::GetStats()
json Utils::Obs::ObjectHelper::GetStats()
{
json ret;
@ -46,7 +46,7 @@ json Utils::Obs::DataHelper::GetStats()
return ret;
}
json Utils::Obs::DataHelper::GetSceneItemTransform(obs_sceneitem_t *item)
json Utils::Obs::ObjectHelper::GetSceneItemTransform(obs_sceneitem_t *item)
{
json ret;