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(GetSceneItemData): add isGroup flag + move Source typedef here

Browse Source
This commit is contained in:
Stéphane Lepin 2019-05-07 13:33:02 +02:00
parent 149ddfa8f8
commit 0744d215c6
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Utils.cpp
View File

@ -27,6 +27,23 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include "Utils.h" #include "Utils.h"
#include "Config.h" #include "Config.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 {Boolean} `isGroup` Whether or not this Scene Item is a group
* @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`
*/
Q_DECLARE_METATYPE(OBSScene); Q_DECLARE_METATYPE(OBSScene);
const QHash<obs_bounds_type, QString> boundTypeNames = { const QHash<obs_bounds_type, QString> boundTypeNames = {
@ -130,6 +147,7 @@ obs_data_t* Utils::GetSceneItemData(obs_sceneitem_t* item) {
obs_data_set_double(data, "cy", item_height * scale.y); obs_data_set_double(data, "cy", item_height * scale.y);
obs_data_set_bool(data, "render", obs_sceneitem_visible(item)); obs_data_set_bool(data, "render", obs_sceneitem_visible(item));
obs_data_set_bool(data, "locked", obs_sceneitem_locked(item)); obs_data_set_bool(data, "locked", obs_sceneitem_locked(item));
obs_data_set_bool(data, "isGroup", obs_sceneitem_is_group(item));
return data; return data;
} }
@ -180,6 +198,10 @@ obs_sceneitem_t* Utils::GetSceneItemFromName(obs_source_t* source, QString name)
return false; return false;
} }
if (obs_sceneitem_is_group(currentItem)) {
}
return true; return true;
}, &search); }, &search);

16
src/WSRequestHandler_SceneItems.cpp
View File

@ -2,22 +2,6 @@
#include "WSRequestHandler.h" #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. * Gets the scene specific properties of the specified source item.
* *