Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Jitsi screensharing support in electron app #4967

Merged
merged 4 commits into from
Sep 25, 2017
Merged

Add Jitsi screensharing support in electron app #4967

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8424d7
ElectronPlatform.js: Add Jitsi screensharing support
superdump Sep 4, 2017
5ffc9c5
Merge branch 'develop' into rob/electron-screensharing
superdump Sep 12, 2017
44c0fb7
Merge branch 'develop' into rob/electron-screensharing
superdump Sep 25, 2017
f79b8e0
ElectronPlatform: Import desktopCapturer explicitly
superdump Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 40 additions & 1 deletion src/vector/platform/ElectronPlatform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import VectorBasePlatform, {updateCheckStatusEnum} from './VectorBasePlatform';
import dis from 'matrix-react-sdk/lib/dispatcher';
import { _t } from 'matrix-react-sdk/lib/languageHandler';
import Promise from 'bluebird';
import {remote, ipcRenderer} from 'electron';
import electron, {remote, ipcRenderer} from 'electron';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just import desktopCapturer into the destructured imports instead of importing the whole of electron
you're already "slighltly-modifying" the copied code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

import rageshake from '../rageshake';

remote.autoUpdater.on('update-downloaded', onUpdateDownloaded);
Expand Down Expand Up @@ -207,4 +207,43 @@ export default class ElectronPlatform extends VectorBasePlatform {
reload() {
remote.getCurrentWebContents().reload();
}

/* BEGIN copied and slightly-modified code
* setupScreenSharingForIframe function from:
* https://github.com/jitsi/jitsi-meet-electron-utils
* Copied directly here to avoid the need for a native electron module for
* 'just a bit of JavaScript'
* NOTE: Apache v2.0 licensed
*/
setupScreenSharingForIframe(iframe: Object) {
iframe.contentWindow.JitsiMeetElectron = {
/**
* Get sources available for screensharing. The callback is invoked
* with an array of DesktopCapturerSources.
*
* @param {Function} callback - The success callback.
* @param {Function} errorCallback - The callback for errors.
* @param {Object} options - Configuration for getting sources.
* @param {Array} options.types - Specify the desktop source types
* to get, with valid sources being "window" and "screen".
* @param {Object} options.thumbnailSize - Specify how big the
* preview images for the sources should be. The valid keys are
* height and width, e.g. { height: number, width: number}. By
* default electron will return images with height and width of
* 150px.
*/
obtainDesktopStreams(callback, errorCallback, options = {}) {
electron.desktopCapturer.getSources(options,
(error, sources) => {
if (error) {
errorCallback(error);
return;
}

callback(sources);
});
},
};
}
/* END of copied and slightly-modified code */
}