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

Merge pull request #157 from haganbmj/patch-2

Browse Source 
docs: update glob to account for relocation to src
This commit is contained in:
Stéphane L 2017-11-13 20:36:47 +01:00 committed by GitHub
commit d75523c111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/docs.js
View File

@ -8,6 +8,9 @@ const helpers = require('handlebars-helpers')({
// Allows pipe characters to be used within markdown tables.
handlebars.registerHelper('depipe', (text) => {
if (!text) {
return text;
}
return text.replace('|', `\\|`);
});

4
src/WSRequestHandler_Sources.cpp
View File

@ -595,7 +595,7 @@ void WSRequestHandler::HandleGetSceneItemProperties(WSRequestHandler* req) {
* @param {String} `bounds.type` The new bounds type of the source.
* @param {int} `bounds.alignment` The new alignment of the bounding box. (0-2, 4-6, 8-10)
* @param {double} `bounds.x` The new width of the bounding box.
* @param {double} `bounds.y' The new height of the bounding box.
* @param {double} `bounds.y` The new height of the bounding box.
*
* @api requests
* @name SetSceneItemProperties
@ -1399,7 +1399,7 @@ void WSRequestHandler::HandleGetSourceTypesList(WSRequestHandler* req) {
* Get settings of the specified source
*
* @param {String} `sourceName` Name of the source item.
* @param {String (optional) `sourceType` Type of the specified source. Useful for type-checking if you expect a specific settings schema.
* @param {String (optional)} `sourceType` Type of the specified source. Useful for type-checking if you expect a specific settings schema.
*
* @return {String} `sourceName` Source name
* @return {String} `sourceType` Type of the specified source