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

Update property -> return as this isn't a typedef

Browse Source
This commit is contained in:
Chris Angelico 2019-05-20 01:47:25 +10:00
parent fd32f7f435
commit 47b485819f
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
docs/generated/comments.json
View File

@ -3537,10 +3537,8 @@
"{int} `sourceWidth` Base width (without scaling) of the source", "{int} `sourceWidth` Base width (without scaling) of the source",
"{int} `sourceHeight` Base source (without scaling) of the source", "{int} `sourceHeight` Base source (without scaling) of the source",
"{double} `width` Scene item width (base source width multiplied by the horizontal scaling factor)", "{double} `width` Scene item width (base source width multiplied by the horizontal scaling factor)",
"{double} `height` Scene item height (base source height multiplied by the vertical scaling factor)" "{double} `height` Scene item height (base source height multiplied by the vertical scaling factor)",
], "{int} `alignment` The point on the source that the item is manipulated from. The sum of 1=Left or 2=Right, and 4=Top or 8=Bottom, or omit to center on that axis.",
"property": [
"{int} `alignment` The point on the source that the item is manipulated from.",
"{String (optional)} `parentGroupName` Name of the item's parent (if this item belongs to a group)", "{String (optional)} `parentGroupName` Name of the item's parent (if this item belongs to a group)",
"{Array<SceneItemTransform> (optional)} `groupChildren` List of children (if this item is a group)" "{Array<SceneItemTransform> (optional)} `groupChildren` List of children (if this item is a group)"
], ],
@ -3653,6 +3651,21 @@
"type": "double", "type": "double",
"name": "height", "name": "height",
"description": "Scene item height (base source height multiplied by the vertical scaling factor)" "description": "Scene item height (base source height multiplied by the vertical scaling factor)"
},
{
"type": "int",
"name": "alignment",
"description": "The point on the source that the item is manipulated from. The sum of 1=Left or 2=Right, and 4=Top or 8=Bottom, or omit to center on that axis."
},
{
"type": "String (optional)",
"name": "parentGroupName",
"description": "Name of the item's parent (if this item belongs to a group)"
},
{
"type": "Array<SceneItemTransform> (optional)",
"name": "groupChildren",
"description": "List of children (if this item is a group)"
} }
], ],
"params": [ "params": [
@ -3667,23 +3680,6 @@
"description": "The name of the source." "description": "The name of the source."
} }
], ],
"properties": [
{
"type": "int",
"name": "alignment",
"description": "The point on the source that the item is manipulated from."
},
{
"type": "String (optional)",
"name": "parentGroupName",
"description": "Name of the item's parent (if this item belongs to a group)"
},
{
"type": "Array<SceneItemTransform> (optional)",
"name": "groupChildren",
"description": "List of children (if this item is a group)"
}
],
"names": [ "names": [
{ {
"name": "", "name": "",

3
docs/generated/protocol.md
View File

@ -1559,6 +1559,9 @@ Coordinates are relative to the item's parent (the scene or group it belongs to)
| `sourceHeight` | _int_ | Base source (without scaling) of the source | | `sourceHeight` | _int_ | Base source (without scaling) of the source |
| `width` | _double_ | Scene item width (base source width multiplied by the horizontal scaling factor) | | `width` | _double_ | Scene item width (base source width multiplied by the horizontal scaling factor) |
| `height` | _double_ | Scene item height (base source height multiplied by the vertical scaling factor) | | `height` | _double_ | Scene item height (base source height multiplied by the vertical scaling factor) |
| `alignment` | _int_ | The point on the source that the item is manipulated from. The sum of 1=Left or 2=Right, and 4=Top or 8=Bottom, or omit to center on that axis. |
| `parentGroupName` | _String (optional)_ | Name of the item's parent (if this item belongs to a group) |
| `groupChildren` | _Array&lt;SceneItemTransform&gt; (optional)_ | List of children (if this item is a group) |
--- ---

6
src/WSRequestHandler_SceneItems.cpp
View File

@ -30,9 +30,9 @@
* @return {int} `sourceHeight` Base source (without scaling) of the source * @return {int} `sourceHeight` Base source (without scaling) of the source
* @return {double} `width` Scene item width (base source width multiplied by the horizontal scaling factor) * @return {double} `width` Scene item width (base source width multiplied by the horizontal scaling factor)
* @return {double} `height` Scene item height (base source height multiplied by the vertical scaling factor) * @return {double} `height` Scene item height (base source height multiplied by the vertical scaling factor)
* @property {int} `alignment` The point on the source that the item is manipulated from. The sum of 1=Left or 2=Right, and 4=Top or 8=Bottom, or omit to center on that axis. * @return {int} `alignment` The point on the source that the item is manipulated from. The sum of 1=Left or 2=Right, and 4=Top or 8=Bottom, or omit to center on that axis.
* @property {String (optional)} `parentGroupName` Name of the item's parent (if this item belongs to a group) * @return {String (optional)} `parentGroupName` Name of the item's parent (if this item belongs to a group)
* @property {Array<SceneItemTransform> (optional)} `groupChildren` List of children (if this item is a group) * @return {Array<SceneItemTransform> (optional)} `groupChildren` List of children (if this item is a group)
* *
* @api requests * @api requests
* @name GetSceneItemProperties * @name GetSceneItemProperties