Skip to content

Commit f40426e

Browse files
committed
utils: Implement input, scene, and transition UUID support
1 parent 830f7eb commit f40426e

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/utils/Obs_ArrayHelper.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ std::vector<json> Utils::Obs::ArrayHelper::GetSceneList()
9696

9797
json sceneJson;
9898
sceneJson["sceneName"] = obs_source_get_name(scene);
99+
sceneJson["sceneUuid"] = obs_source_get_uuid(scene);
99100
sceneJson["sceneIndex"] = sceneList.sources.num - i - 1;
100101

101102
ret.push_back(sceneJson);
@@ -150,6 +151,7 @@ std::vector<json> Utils::Obs::ArrayHelper::GetSceneItemList(obs_scene_t *scene,
150151
item["sceneItemBlendMode"] = obs_sceneitem_get_blending_mode(sceneItem);
151152
OBSSource itemSource = obs_sceneitem_get_source(sceneItem);
152153
item["sourceName"] = obs_source_get_name(itemSource);
154+
item["sourceUuid"] = obs_source_get_uuid(itemSource);
153155
item["sourceType"] = obs_source_get_type(itemSource);
154156
if (obs_source_get_type(itemSource) == OBS_SOURCE_TYPE_INPUT)
155157
item["inputKind"] = obs_source_get_id(itemSource);
@@ -195,6 +197,7 @@ std::vector<json> Utils::Obs::ArrayHelper::GetInputList(std::string inputKind)
195197

196198
json inputJson;
197199
inputJson["inputName"] = obs_source_get_name(input);
200+
inputJson["inputUuid"] = obs_source_get_uuid(input);
198201
inputJson["inputKind"] = inputKind;
199202
inputJson["unversionedInputKind"] = obs_source_get_unversioned_id(input);
200203

@@ -281,6 +284,7 @@ std::vector<json> Utils::Obs::ArrayHelper::GetSceneTransitionList()
281284
obs_source_t *transition = transitionList.sources.array[i];
282285
json transitionJson;
283286
transitionJson["transitionName"] = obs_source_get_name(transition);
287+
transitionJson["transitionUuid"] = obs_source_get_uuid(transition);
284288
transitionJson["transitionKind"] = obs_source_get_id(transition);
285289
transitionJson["transitionFixed"] = obs_transition_fixed(transition);
286290
transitionJson["transitionConfigurable"] = obs_source_configurable(transition);

src/utils/Obs_VolumeMeter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ json Utils::Obs::VolumeMeter::Meter::GetMeterData()
9393
l.unlock();
9494

9595
ret["inputName"] = obs_source_get_name(input);
96+
ret["inputUuid"] = obs_source_get_uuid(input);
9697
ret["inputLevelsMul"] = levels;
9798

9899
return ret;

0 commit comments

Comments
 (0)