Skip to content

Commit dc7f23f

Browse files
SML-MeSoSML-MeSo
authored
Merge pull request #238 from xjsframework/issue-204
Issue 204: Add static methods for pausing and unpausing local recording
2 parents 3092fa0 + f5a5ca9 commit dc7f23f

57 files changed

Lines changed: 9472 additions & 281 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ node_modules/
33
*.sublime-workspace
44
docs/bower_components/
55
dist/api/
6-
package-lock.json
6+
*.vscode

‎.vscode/settings.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"files.exclude": {
3+
"dist/": true,
4+
"docs/": true
5+
}
6+
}

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "xjs-framework",
3-
"version": "2.9.1",
3+
"version": "2.10.0",
44
"homepage": "https://github.com/xjsframework/xjs",
55
"authors": [
66
"[email protected]"

‎dist/xjs-es2015.js‎

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* XSplit JS Framework
3-
* version: 2.9.1
3+
* version: 2.10.0
44
*
55
* XSplit Extensibility Framework and Plugin License
66
*
@@ -4793,6 +4793,28 @@ var Output = (function () {
47934793
});
47944794
});
47954795
};
4796+
/**
4797+
* return: Promise<boolean>
4798+
*
4799+
* Pause a local recording.
4800+
*/
4801+
Output.pauseLocalRecording = function () {
4802+
return new Promise(function (resolve) {
4803+
internal_1.exec('CallHost', 'pauseRecording', 'Local Recording');
4804+
resolve(true);
4805+
});
4806+
};
4807+
/**
4808+
* return: Promise<boolean>
4809+
*
4810+
* Unpause a local recording.
4811+
*/
4812+
Output.unpauseLocalRecording = function () {
4813+
return new Promise(function (resolve) {
4814+
internal_1.exec('CallHost', 'unpauseRecording', 'Local Recording');
4815+
resolve(true);
4816+
});
4817+
};
47964818
/**
47974819
* return: Promise<string>
47984820
*
@@ -4869,6 +4891,8 @@ var Output = (function () {
48694891
});
48704892
};
48714893
/**
4894+
* ** For Deprecation, please use the static method instead
4895+
*
48724896
* return: Promise<boolean>
48734897
*
48744898
* Pause a local recording.
@@ -4900,6 +4924,8 @@ var Output = (function () {
49004924
});
49014925
};
49024926
/**
4927+
* ** For Deprecation, please use the static method instead
4928+
*
49034929
* return: Promise<boolean>
49044930
*
49054931
* Unpause a local recording.
@@ -5082,7 +5108,7 @@ var Scene = (function () {
50825108
Scene._initializeScenePoolAsync = function () {
50835109
return new Promise(function (resolve) {
50845110
Scene._scenePool = [];
5085-
app_1.App.getAsList('presetconfig')
5111+
app_1.App.getAsList('sceneconfig')
50865112
.then(function (jsonArr) {
50875113
if (version_1.versionCompare(version_1.getVersion()).is.lessThan(version_1.minVersion)) {
50885114
var count = jsonArr.length;
@@ -5301,7 +5327,7 @@ var Scene = (function () {
53015327
}
53025328
else {
53035329
app_1.App.getGlobalProperty('splitmode').then(function (res) {
5304-
var preset = res === '1' ? 'preset:1' : 'preset:0';
5330+
var preset = res === '1' ? 'scene:1' : 'scene:0';
53055331
app_1.App.get(preset).then(function (id) {
53065332
return Scene.getBySceneIndex(Number(id));
53075333
}).then(function (scene) {
@@ -5326,7 +5352,7 @@ var Scene = (function () {
53265352
}
53275353
else {
53285354
app_1.App.getGlobalProperty('splitmode').then(function (res) {
5329-
var preset = res === '1' ? 'preset:1' : 'preset:0';
5355+
var preset = res === '1' ? 'scene:1' : 'scene:0';
53305356
if (scene instanceof Scene) {
53315357
app_1.App.set(preset, String(scene._id)).then(function (res) {
53325358
resolve(res);
@@ -5968,11 +5994,11 @@ var Scene = (function () {
59685994
}
59695995
else {
59705996
if (version_1.versionCompare(version_1.getVersion()).is.lessThan(version_1.minVersion)) {
5971-
app_1.App.get('presetcount').then(function (cnt) {
5997+
app_1.App.get('scenecount').then(function (cnt) {
59725998
if (Number(cnt) < 12) {
59735999
// Insert an empty scene for scene #12
59746000
app_1.App
5975-
.set('presetconfig:11', '<placement name="Scene 12" defpos="0" />')
6001+
.set('sceneconfig:11', '<placement name="Scene 12" defpos="0" />')
59766002
.then(function (res) {
59776003
resolve(res);
59786004
});
@@ -6011,7 +6037,7 @@ var Scene = (function () {
60116037
var _this = this;
60126038
return new Promise(function (resolve, reject) {
60136039
var _sceneId = version_1.versionCompare(version_1.getVersion()).is.lessThan(version_1.sceneUidMinVersion) ? _this._id : _this._uid;
6014-
app_1.App.getAsItemList('presetconfig:' + _sceneId).then(function (jsonArr) {
6040+
app_1.App.getAsItemList('sceneconfig:' + _sceneId).then(function (jsonArr) {
60156041
var promiseArray = [];
60166042
var uniqueObj = {};
60176043
var uniqueSrc = [];
@@ -6205,7 +6231,7 @@ var Scene = (function () {
62056231
var _this = this;
62066232
return new Promise(function (resolve) {
62076233
var _sceneId = version_1.versionCompare(version_1.getVersion()).is.lessThan(version_1.sceneUidMinVersion) ? _this._id : _this._uid;
6208-
app_1.App.get('presetname:' + _sceneId).then(function (val) {
6234+
app_1.App.get('scenename:' + _sceneId).then(function (val) {
62096235
resolve(val);
62106236
});
62116237
});
@@ -6228,7 +6254,7 @@ var Scene = (function () {
62286254
}
62296255
else {
62306256
var _sceneId = version_1.versionCompare(version_1.getVersion()).is.lessThan(version_1.sceneUidMinVersion) ? _this._id : _this._uid;
6231-
app_1.App.set('presetname:' + _sceneId, name).then(function (value) {
6257+
app_1.App.set('scenename:' + _sceneId, name).then(function (value) {
62326258
resolve(value);
62336259
});
62346260
}
@@ -6252,7 +6278,7 @@ var Scene = (function () {
62526278
var _this = this;
62536279
return new Promise(function (resolve, reject) {
62546280
var _sceneId = version_1.versionCompare(version_1.getVersion()).is.lessThan(version_1.sceneUidMinVersion) ? _this._id : _this._uid;
6255-
app_1.App.getAsItemList('presetconfig:' + _sceneId).then(function (jsonArr) {
6281+
app_1.App.getAsItemList('sceneconfig:' + _sceneId).then(function (jsonArr) {
62566282
var promiseArray = [];
62576283
// type checking to return correct Source subtype
62586284
var typePromise = function (index) { return new Promise(function (typeResolve) {
@@ -6331,7 +6357,7 @@ var Scene = (function () {
63316357
var _this = this;
63326358
return new Promise(function (resolve) {
63336359
var _sceneId = version_1.versionCompare(version_1.getVersion()).is.lessThan(version_1.sceneUidMinVersion) ? _this._id : _this._uid;
6334-
app_1.App.get('presetisempty:' + _sceneId).then(function (val) {
6360+
app_1.App.get('sceneisempty:' + _sceneId).then(function (val) {
63356361
resolve(val === '1');
63366362
});
63376363
});
@@ -6390,7 +6416,7 @@ var Scene = (function () {
63906416
var sceneName;
63916417
_this.getName().then(function (name) {
63926418
sceneName = name;
6393-
return app_1.App.getAsList('presetconfig:' + _sceneId);
6419+
return app_1.App.getAsList('sceneconfig:' + _sceneId);
63946420
}).then(function (jsonArr) {
63956421
var newOrder = new json_1.JSON();
63966422
newOrder.children = [];
@@ -6408,7 +6434,7 @@ var Scene = (function () {
64086434
}
64096435
newOrder.children[ids.indexOf(jsonArr[i]['id'])] = jsonArr[i];
64106436
}
6411-
app_1.App.set('presetconfig:' + _sceneId,
6437+
app_1.App.set('sceneconfig:' + _sceneId,
64126438
//Revert back the formatting from json when transforming to xml
64136439
xml_1.XML.parseJSON(newOrder).toString().replace(/\\\\/g, '\\')).then(function () {
64146440
resolve(_this);
@@ -9997,7 +10023,7 @@ var Source = (function () {
999710023
var uniqueObj = {};
999810024
var uniqueSrc = [];
999910025
var promiseArray = [];
10000-
app_1.App.getAsItemList('presetconfig').then(function (jsonArr) {
10026+
app_1.App.getAsItemList('sceneconfig').then(function (jsonArr) {
1000110027
allJson = jsonArr;
1000210028
var sourcePromise = function (srcid) { return new Promise(function (sourceResolve) {
1000310029
scene_1.Scene.searchSourcesById(srcid).then(function (result) {
@@ -10323,7 +10349,7 @@ var Thumbnail = (function () {
1032310349
}
1032410350
});
1032510351
scenePromise.then(function (sceneUid) {
10326-
app_1.App.get("presetthumbnail:" + sceneUid)
10352+
app_1.App.get("scenethumbnail:" + sceneUid)
1032710353
.then(function (thumb) {
1032810354
resolve(thumb);
1032910355
});
@@ -11187,7 +11213,7 @@ var Item = (function () {
1118711213
}
1118811214
else {
1118911215
var idMatch, sceneMatch;
11190-
app_1.App.getAsItemList('presetconfig')
11216+
app_1.App.getAsItemList('sceneconfig')
1119111217
.then(function (jsonArr) {
1119211218
for (var i = 0; i < jsonArr.length; i++) {
1119311219
if (jsonArr[i] !== undefined) {
@@ -11208,7 +11234,7 @@ var Item = (function () {
1120811234
}
1120911235
else {
1121011236
return new Promise(function (previewResolve, previewReject) {
11211-
app_1.App.getAsItemList('presetconfig:i12')
11237+
app_1.App.getAsItemList('sceneconfig:i12')
1121211238
.then(function (previewJSONArr) {
1121311239
var previewMatch = '';
1121411240
for (var k = 0; k < previewJSONArr.length; ++k) {
@@ -11300,7 +11326,7 @@ var Item = (function () {
1130011326
}
1130111327
else {
1130211328
var idMatch, sceneMatch;
11303-
app_1.App.getAsItemList('presetconfig')
11329+
app_1.App.getAsItemList('sceneconfig')
1130411330
.then(function (jsonArr) {
1130511331
for (var i = 0; i < jsonArr.length; i++) {
1130611332
if (jsonArr[i] !== undefined) {
@@ -11321,7 +11347,7 @@ var Item = (function () {
1132111347
}
1132211348
else {
1132311349
return new Promise(function (previewResolve, previewReject) {
11324-
app_1.App.getAsItemList('presetconfig:i12')
11350+
app_1.App.getAsItemList('sceneconfig:i12')
1132511351
.then(function (previewJSONArr) {
1132611352
var previewMatch = '';
1132711353
for (var k = 0; k < previewJSONArr.length; ++k) {
@@ -12828,16 +12854,16 @@ var Game = (function () {
1282812854
var defposPromise;
1282912855
if (environment_1.Environment.isSourcePlugin()) {
1283012856
defposPromise = new Promise(function (defposResolve) {
12831-
app_1.App.get('presetconfig:-1').then(function (presetConfig) {
12857+
app_1.App.get('sceneconfig:-1').then(function (presetConfig) {
1283212858
var placementJSON = json_1.JSON.parse(presetConfig);
1283312859
defposResolve(placementJSON['defpos']);
1283412860
});
1283512861
});
1283612862
}
1283712863
else {
1283812864
defposPromise = new Promise(function (defposResolve) {
12839-
app_1.App.get('preset:0').then(function (main) {
12840-
return app_1.App.get('presetconfig:' + main);
12865+
app_1.App.get('scene:0').then(function (main) {
12866+
return app_1.App.get('sceneconfig:' + main);
1284112867
}).then(function (presetConfig) {
1284212868
var placementJSON = json_1.JSON.parse(presetConfig);
1284312869
defposResolve(placementJSON['defpos']);
@@ -13611,8 +13637,8 @@ var VideoPlaylist = (function () {
1361113637
}
1361213638
var _inner_this = _this;
1361313639
if (!isError) {
13614-
app_1.App.get('preset:0').then(function (main) {
13615-
return app_1.App.get('presetconfig:' + main);
13640+
app_1.App.get('scene:0').then(function (main) {
13641+
return app_1.App.get('sceneconfig:' + main);
1361613642
}).then(function (presetConfig) {
1361713643
var placementJSON = json_1.JSON.parse(presetConfig);
1361813644
var defpos = placementJSON['defpos'];
@@ -15258,7 +15284,7 @@ var ExtensionWindow = (function (_super) {
1525815284
if (environment_1.Environment.isExtension()) {
1525915285
var property = settingsObj['args'][0];
1526015286
var newValue = settingsObj['args'][1];
15261-
if (property.startsWith('presetconfign:') || property.startsWith('presetconfig:')) {
15287+
if (property.startsWith('sceneconfign:') || property.startsWith('sceneconfig:')) {
1526215288
var changedIndex = property.split(":")[1];
1526315289
scene_1.Scene.getActiveScene().then(function (scene) {
1526415290
return scene.getSceneNumber();

‎dist/xjs-es2015.min.js‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)