matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00
Code Activity

screenSharingStream -> localScreenSharingStream

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-08-02 21:14:59 +02:00
parent 1e281f6838
commit aae8f1c706
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/webrtc/call.ts
View File

@@ -277,7 +277,7 @@ export class MatrixCall extends EventEmitter {
private sentEndOfCandidates: boolean; private sentEndOfCandidates: boolean;
private peerConn: RTCPeerConnection; private peerConn: RTCPeerConnection;
private feeds: Array<CallFeed>; private feeds: Array<CallFeed>;
private screenSharingStream: MediaStream; private localScreenSharingStream: MediaStream;
// TODO: Rename to usermedia rather than AV for consistency // TODO: Rename to usermedia rather than AV for consistency
private localUsermediaStream: MediaStream; private localUsermediaStream: MediaStream;
private usermediaSenders: Array<RTCRtpSender>; private usermediaSenders: Array<RTCRtpSender>;
@@ -780,7 +780,7 @@ export class MatrixCall extends EventEmitter {
* @returns {boolean} is screensharing * @returns {boolean} is screensharing
*/ */
public isScreensharing(): boolean { public isScreensharing(): boolean {
return Boolean(this.screenSharingStream); return Boolean(this.localScreenSharingStream);
} }
/** /**
@@ -810,9 +810,9 @@ export class MatrixCall extends EventEmitter {
logger.debug(`Set screensharing enabled? ${enabled}`); logger.debug(`Set screensharing enabled? ${enabled}`);
if (enabled) { if (enabled) {
try { try {
this.screenSharingStream = await getScreensharingStream(selectDesktopCapturerSource); this.localScreenSharingStream = await getScreensharingStream(selectDesktopCapturerSource);
if (!this.screenSharingStream) return false; if (!this.localScreenSharingStream) return false;
this.pushLocalFeed(this.screenSharingStream, SDPStreamMetadataPurpose.Screenshare); this.pushLocalFeed(this.localScreenSharingStream, SDPStreamMetadataPurpose.Screenshare);
return true; return true;
} catch (err) { } catch (err) {
this.emit(CallEvent.Error, this.emit(CallEvent.Error,
@@ -824,11 +824,11 @@ export class MatrixCall extends EventEmitter {
for (const sender of this.screensharingSenders) { for (const sender of this.screensharingSenders) {
this.peerConn.removeTrack(sender); this.peerConn.removeTrack(sender);
} }
this.deleteFeedByStream(this.screenSharingStream); this.deleteFeedByStream(this.localScreenSharingStream);
for (const track of this.screenSharingStream.getTracks()) { for (const track of this.localScreenSharingStream.getTracks()) {
track.stop(); track.stop();
} }
this.screenSharingStream = null; this.localScreenSharingStream = null;
return false; return false;
} }
} }
@@ -847,10 +847,10 @@ export class MatrixCall extends EventEmitter {
logger.debug(`Set screensharing enabled? ${enabled} using replaceTrack()`); logger.debug(`Set screensharing enabled? ${enabled} using replaceTrack()`);
if (enabled) { if (enabled) {
try { try {
this.screenSharingStream = await getScreensharingStream(selectDesktopCapturerSource); this.localScreenSharingStream = await getScreensharingStream(selectDesktopCapturerSource);
if (!this.screenSharingStream) return false; if (!this.localScreenSharingStream) return false;
const track = this.screenSharingStream.getTracks().find((track) => { const track = this.localScreenSharingStream.getTracks().find((track) => {
return track.kind === "video"; return track.kind === "video";
}); });
const sender = this.usermediaSenders.find((sender) => { const sender = this.usermediaSenders.find((sender) => {
@@ -858,7 +858,7 @@ export class MatrixCall extends EventEmitter {
}); });
sender.replaceTrack(track); sender.replaceTrack(track);
this.pushLocalFeed(this.screenSharingStream, SDPStreamMetadataPurpose.Screenshare, false); this.pushLocalFeed(this.localScreenSharingStream, SDPStreamMetadataPurpose.Screenshare, false);
return true; return true;
} catch (err) { } catch (err) {
@@ -876,11 +876,11 @@ export class MatrixCall extends EventEmitter {
}); });
sender.replaceTrack(track); sender.replaceTrack(track);
this.deleteFeedByStream(this.screenSharingStream); this.deleteFeedByStream(this.localScreenSharingStream);
for (const track of this.screenSharingStream.getTracks()) { for (const track of this.localScreenSharingStream.getTracks()) {
track.stop(); track.stop();
} }
this.screenSharingStream = null; this.localScreenSharingStream = null;
return false; return false;
} }