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.

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

Add Jitsi screensharing support in electron app #4967

Merged
merged 4 commits into from Sep 25, 2017

Conversation

@superdump
Copy link
Contributor

superdump commented Sep 4, 2017

This is dependent on: matrix-org/matrix-react-sdk#1355

I don't like that I had to copy code for this. It is Apache v2.0 licensed code with no specific copyright header. However, the full https://github.com/jitsi/jitsi-meet-electron-utils is a native electron module that would significantly complicate its integration when we just want to use this small amount of JS code. Comments/help welcome on this.

@superdump superdump requested a review from dbkr Sep 4, 2017
@@ -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';

This comment has been minimized.

Copy link
@t3chguy

t3chguy Sep 4, 2017

Collaborator

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

This comment has been minimized.

Copy link
@superdump

superdump Sep 25, 2017

Author Contributor

Done.

@dbkr
dbkr approved these changes Sep 25, 2017
@dbkr dbkr merged commit 94855c0 into develop Sep 25, 2017
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.