Skip to content

Commit

Permalink
Merge pull request #58 from prlanzarin/v2.4.x-release-backport-56
Browse files Browse the repository at this point in the history
Backport #56 to 2.4.x and bump to v2.4.15
  • Loading branch information
antobinary authored Aug 25, 2020
2 parents ca6f02b + 1513787 commit 8dfb34d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions lib/video/VideoManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = class VideoManager extends BaseManager {
let cameraId = message.cameraId;
let shared = role === 'share' ? true : false;
let iceQueue;
let record = message.record;

Logger.debug(this._logPrefix, 'Received message =>', message);

Expand Down Expand Up @@ -79,6 +80,7 @@ module.exports = class VideoManager extends BaseManager {
userId,
userName,
sessionId,
record,
);
this._sessions[sessionId] = video;
} else {
Expand All @@ -97,6 +99,7 @@ module.exports = class VideoManager extends BaseManager {
userId,
userName,
sessionId,
record,
);
this._sessions[sessionId] = video;
}
Expand Down
4 changes: 3 additions & 1 deletion lib/video/video.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module.exports = class Video extends BaseProvider {
bbbUserId,
bbbUserName,
managerSessionId,
record = true,
) {
super(bbbGW);
this.sfuApp = C.VIDEO_APP;
Expand Down Expand Up @@ -58,6 +59,7 @@ module.exports = class Video extends BaseProvider {
this._stopActionQueued = false;
this.handleMCSCoreDisconnection = this.handleMCSCoreDisconnection.bind(this);
this.mcs.on(C.MCS_DISCONNECTED, this.handleMCSCoreDisconnection);
this.record = record;
}

_getLogMetadata () {
Expand Down Expand Up @@ -310,7 +312,7 @@ module.exports = class Video extends BaseProvider {
/* ======= RECORDING METHODS ======= */

shouldRecord () {
return this.isRecorded && this.shared;
return this.isRecorded && this.shared && this.record;
}

sendStartShareEvent(timestampHR, timestampUTC) {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bbb-webrtc-sfu",
"version": "2.4.14",
"version": "2.4.15",
"private": true,
"scripts": {
"start": "node server.js",
Expand Down

0 comments on commit 8dfb34d

Please sign in to comment.