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 a display_id parameter to the desktopCapturer API. (backport: 2-1-x) #13986

Merged
merged 11 commits into from Aug 8, 2018

Conversation

Projects
None yet
2 participants
@trop
Copy link
Contributor

trop bot commented Aug 8, 2018

Backport of #12417

See that PR for details.

ajmacd added some commits Mar 23, 2018

Add a screen_api_id parameter to the desktopCapturer API.
When using the DirectX capturer on Windows, there was previously no way
to associate desktopCapturer/getUserMedia and electron.screen API
screens. This new parameter provides the association.

@trop trop bot requested review from as code owners Aug 8, 2018

@trop trop bot added the backport label Aug 8, 2018

@ckerr

ckerr approved these changes Aug 8, 2018

@ckerr ckerr merged commit 2909703 into electron:2-1-x Aug 8, 2018

8 of 12 checks passed

ci/circleci: electron-mas-x64 Your tests failed on CircleCI
Details
Semantic Pull Request add a semantic commit or PR title
Details
appveyor: electron-ia32-pr Waiting for AppVeyor build to complete
Details
appveyor: electron-x64-pr Waiting for AppVeyor build to complete
Details
WIP ready for review
Details
ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-osx-x64 Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.