Commit dac3259c authored 4 years ago by prlanzarin

Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base

parents 3da55d98 9b450ae1

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-html5/imports/api/audio/client/bridge/base.js 4 additions, 0 deletions

bigbluebutton-html5/imports/api/audio/client/bridge/base.js
bigbluebutton-html5/imports/api/audio/client/bridge/kurento.js 7 additions, 0 deletions

...uebutton-html5/imports/api/audio/client/bridge/kurento.js
bigbluebutton-html5/imports/api/audio/client/bridge/sip.js 8 additions, 0 deletions

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js 0 additions, 2 deletions

...orts/api/users-settings/server/methods/addUserSettings.js
bigbluebutton-html5/imports/api/video-streams/server/handlers/userSharedHtml5Webcam.js 1 addition, 5 deletions

...pi/video-streams/server/handlers/userSharedHtml5Webcam.js
bigbluebutton-html5/imports/api/video-streams/server/handlers/userUnsharedHtml5Webcam.js 2 additions, 6 deletions

.../video-streams/server/handlers/userUnsharedHtml5Webcam.js
bigbluebutton-html5/imports/api/video-streams/server/helpers.js 28 additions, 0 deletions

...ebutton-html5/imports/api/video-streams/server/helpers.js
bigbluebutton-html5/imports/api/video-streams/server/modifiers/sharedWebcam.js 12 additions, 2 deletions

...mports/api/video-streams/server/modifiers/sharedWebcam.js
bigbluebutton-html5/imports/api/video-streams/server/modifiers/unsharedWebcam.js 8 additions, 3 deletions

...orts/api/video-streams/server/modifiers/unsharedWebcam.js
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx 1 addition, 6 deletions

...ton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx 0 additions, 3 deletions

...ton-html5/imports/ui/components/actions-bar/container.jsx
bigbluebutton-html5/imports/ui/components/media/component.jsx 0 additions, 21 deletions

...luebutton-html5/imports/ui/components/media/component.jsx
bigbluebutton-html5/imports/ui/components/media/container.jsx 1 addition, 3 deletions

...luebutton-html5/imports/ui/components/media/container.jsx
bigbluebutton-html5/imports/ui/components/media/service.js 0 additions, 1 deletion

bigbluebutton-html5/imports/ui/components/media/service.js
bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx 0 additions, 2 deletions

...rts/ui/components/nav-bar/settings-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/video-preview/component.jsx 98 additions, 70 deletions

...n-html5/imports/ui/components/video-preview/component.jsx
bigbluebutton-html5/imports/ui/components/video-preview/container.jsx 9 additions, 9 deletions

...n-html5/imports/ui/components/video-preview/container.jsx
bigbluebutton-html5/imports/ui/components/video-provider/component.jsx 243 additions, 653 deletions

...-html5/imports/ui/components/video-provider/component.jsx
bigbluebutton-html5/imports/ui/components/video-provider/container.jsx 4 additions, 21 deletions

...-html5/imports/ui/components/video-provider/container.jsx
bigbluebutton-html5/imports/ui/components/video-provider/service.js 281 additions, 91 deletions

...ton-html5/imports/ui/components/video-provider/service.js

with 707 additions and 898 deletions

Please register or to comment