diff --git a/src/Utils.cpp b/src/Utils.cpp index 2352f9fd..442a1137 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -115,11 +115,13 @@ obs_data_t* Utils::GetSceneItemData(obs_sceneitem_t* item) { obs_data_t* data = obs_data_create(); obs_data_set_string(data, "name", - obs_source_get_name(obs_sceneitem_get_source(item))); + obs_source_get_name(itemSource)); + obs_data_set_int(data, "id", + obs_sceneitem_get_id(item)); obs_data_set_string(data, "type", - obs_source_get_id(obs_sceneitem_get_source(item))); + obs_source_get_id(itemSource)); obs_data_set_double(data, "volume", - obs_source_get_volume(obs_sceneitem_get_source(item))); + obs_source_get_volume(itemSource)); obs_data_set_double(data, "x", pos.x); obs_data_set_double(data, "y", pos.y); obs_data_set_int(data, "source_cx", (int)item_width); diff --git a/src/WSRequestHandler_SceneItems.cpp b/src/WSRequestHandler_SceneItems.cpp index 1a906277..25e1af7a 100644 --- a/src/WSRequestHandler_SceneItems.cpp +++ b/src/WSRequestHandler_SceneItems.cpp @@ -2,6 +2,22 @@ #include "WSRequestHandler.h" +/** +* @typedef {Object} `Source` An OBS Scene Item. +* @property {Number} `cy` +* @property {Number} `cx` +* @property {String} `name` The name of this Scene Item. +* @property {int} `id` Scene item ID +* @property {Boolean} `render` Whether or not this Scene Item is set to "visible". +* @property {Boolean} `locked` Whether or not this Scene Item is locked and can't be moved around +* @property {Number} `source_cx` +* @property {Number} `source_cy` +* @property {String} `type` Source type. Value is one of the following: "input", "filter", "transition", "scene" or "unknown" +* @property {Number} `volume` +* @property {Number} `x` +* @property {Number} `y` +*/ + /** * Gets the scene specific properties of the specified source item. * diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp index 592be38e..03ab8ada 100644 --- a/src/WSRequestHandler_Sources.cpp +++ b/src/WSRequestHandler_Sources.cpp @@ -2,20 +2,6 @@ #include "WSRequestHandler.h" -/** -* @typedef {Object} `Source` An OBS Scene Item. -* @property {Number} `cy` -* @property {Number} `cx` -* @property {String} `name` The name of this Scene Item. -* @property {Boolean} `render` Whether or not this Scene Item is set to "visible". -* @property {Number} `source_cx` -* @property {Number} `source_cy` -* @property {String} `type` Source type. Value is one of the following: "input", "filter", "transition", "scene" or "unknown" -* @property {Number} `volume` -* @property {Number} `x` -* @property {Number} `y` -*/ - /** * List all sources available in the running OBS instance *