Граф коммитов

180 Коммитов

Автор SHA1 Сообщение Дата
Ivan Sein 64ef280ba2 Add screensharingIndicator if participant's screen was added before participant's video is added.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-31 15:18:38 +02:00
Ivan Sein 11596df992 Add tooltip to screensharing indicators.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-30 18:18:21 +02:00
Ivan Sein bf00a79b69 Add own screensharing options menu.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-30 12:45:52 +02:00
Ivan Sein 55acd30c68 First draft for screensharing selection feature.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-29 14:34:59 +02:00
Ivan Sein 5402cf202a Avoid printing raw error message in empty-content.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-27 10:16:49 +02:00
Ivan Sein e7377d2f4c Add screens inside containers.
Refresh name indicators.
Create screens div and differenciate between local and remote screens.

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-21 17:58:53 +01:00
Ivan Sein d59a382eaa Emit correctly 'localScreenStopped' message.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-20 16:59:09 +01:00
Ivan Sein 063a661bfe Add name indicators to screens being shared.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-20 16:59:01 +01:00
Ivan Sein d88480378f Merge pull request #227 from nextcloud/screensharing
Add screensharing support.
2017-03-14 20:33:37 +01:00
Ivan Sein ae9d60dbc1 Fix position and resize screensharing videos.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-14 20:14:47 +01:00
Ivan Sein 7aa694e399 Restart event source when joining a room.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-10 16:29:00 +01:00
Ivan Sein db63dbf716 Re-order spreed launch and audio/video initialization.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-08 18:32:54 +01:00
Ivan Sein bb3c410815 Give user better feedback when launching Spreed.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-07 18:15:27 +01:00
Ivan Sein ad27ee16af Send shared screen to new call participants.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-03-01 16:04:06 +01:00
Ivan Sein cb930c8d3f Change video layouts when screensharing.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-02-24 18:55:05 +01:00
Ivan Sein 11cad90590 Adjust avatars and name/audio indicators.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-02-21 17:08:20 +01:00
Ivan Sein c985229655 Fix getContainerId function.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-02-20 15:37:48 +01:00
Joachim Bauch 4058c399fb Implement first draft of screensharing support.
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2017-02-16 16:37:24 +01:00
Joachim Bauch 278cf464cd
Fixed wrong peer type for regular (video) streams.
Processing in "simplewebrtc.js" caused this clientlist structure to create
peers with type `type` where they should have type `video`.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2017-01-24 15:20:47 +01:00
Ivan Sein e93ee2a39d Disable camera button and show avatar when no camera is detected (FF only).
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-01-18 14:54:10 +01:00
Ivan Sein 3f8c4c5bb1 Audio-only fallback when no camera detected.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-01-18 10:42:37 +01:00
Ivan Sein 7ebe118f03 Merge pull request #195 from nextcloud/guest-avatar
Show default non-user avatar for guests when disabling video
2017-01-04 16:06:53 +01:00
Ivan Sein 4d69707531 Merge pull request #186 from nextcloud/leave-current-room
Leave current room without reloading the page
2017-01-04 16:06:05 +01:00
Ivan Sein 63d13d465d Change emptyContentIcon element id to emptycontent-icon.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-12-15 23:50:24 +01:00
Ivan Sein 8cec497c29 Use single quotes in JS.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-12-15 23:41:33 +01:00
Ivan Sein 7e03c2d4de Set default non-user avatar for guests.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-12-15 19:08:26 +01:00
Joas Schilling 7da243b447
Improve translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 13:18:13 +01:00
Ivan Sein 8018474c41 Save guest's display name in local storage and send updates on new peer connections.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-12-12 18:02:58 +01:00
Ivan Sein 744ac11e76 Add feature for changing guest's display name.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-12-12 17:55:12 +01:00
Ivan Sein aa593b9496 Remember audio and video settings.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-12-09 18:37:27 +01:00
Ivan Sein 1c1d3fd6ef Add 'Guest' as name indicator for guests.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-12-01 15:15:56 +01:00
Ivan Sein 2cfde08637 Fix JS linting errors.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-11-25 10:15:42 +01:00
Ivan Sein d3bd3cd033 Add different message on emptycontent depending on room type.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-11-24 20:32:02 +01:00
Ivan Sein a2e2db0af7 Remove executable flag added by samba.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2016-11-23 15:32:01 +01:00
Morris Jobke f57b2ef624
Fix eslint errors
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-21 17:21:08 +01:00
Jan-Christoph Borchardt 4911cc881d also change icon when WebRTC is not supported
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-18 15:13:41 +01:00
Morris Jobke 6d499d716f
also show error message on event
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 12:07:16 +01:00
Jan-Christoph Borchardt ff1580f9a8
add correct error handler and better messages
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-18 12:07:16 +01:00
Jan-Christoph Borchardt 166b751814
also fix layout of other error
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-18 12:07:16 +01:00
Jan-Christoph Borchardt 66316da093
show feedback when WebRTC is not supported by the browser
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-18 12:07:16 +01:00
Morris Jobke adb45e4ffd
remove speaking state on mute
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 11:16:56 +01:00
Morris Jobke 21013a18e7
forcefully remove peers that drop out of the call
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 11:12:25 +01:00
Morris Jobke ea3cfcdd7f
Only use the name
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 03:04:03 +01:00
Morris Jobke 17c7e07607
missed the copy
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 02:24:52 +01:00
Morris Jobke 8c6e8912c8
add dedicated speaking indicator
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 02:22:51 +01:00
Morris Jobke 939ac922e3
fix dummy container and speaking
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 02:14:33 +01:00
Morris Jobke 393cc85cad
add speaking css class to all speakers to indicate their audio status
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 01:49:24 +01:00
Morris Jobke d3b9ca8f0f
fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 01:31:24 +01:00
Morris Jobke cf09dd8895
also remove disconnected peers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 01:28:08 +01:00
Morris Jobke 7342ed431e
more debug output
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 01:24:01 +01:00
Morris Jobke 5d53c2028a
more debug output
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 01:22:19 +01:00
Morris Jobke 45267ef209
always delete the previous dummy containter
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 01:22:19 +01:00
Morris Jobke 62abcc1ee3
promote rejoined speaker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 01:14:20 +01:00
Morris Jobke ff1ac68c00
automatically enable video when a stream is received and disable by default
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 23:59:55 +01:00
Morris Jobke 2e9f21d609
remove promoted speaker if it is disconnected
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 23:12:07 +01:00
Jan-Christoph Borchardt 1ac72a7f50 use video-off icon for error message
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 16:56:01 +01:00
Roeland Jago Douma 4386e6a009
Hide video on video mute
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 15:06:27 +01:00
Morris Jobke 649734d11d
make it more robust
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 06:42:06 +01:00
Morris Jobke 40d7e56749
debug the 💩 out of it
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 06:26:18 +01:00
Lukas Reschke dbf2a52804
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 06:06:05 +01:00
Morris Jobke 9a29ac26f7
handle case where the container somehow does not hold a video
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 06:05:59 +01:00
Lukas Reschke 67c6b10bf8
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 06:05:53 +01:00
Lukas Reschke ddb1319fbd
Keep state of video and avatar when loading
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 06:05:35 +01:00
Morris Jobke 63ff011ec4
use mute icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 05:55:51 +01:00
Lukas Reschke 9ebe5fa1d6
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 05:47:27 +01:00
Lukas Reschke 483b1444a9
Use datachannel for audio and video state
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 05:47:15 +01:00
Morris Jobke 45f654c3c5
copy mute icon and use a valid icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 05:23:56 +01:00
Roeland Jago Douma 28e8657444
Avatar to 128
We need a container of 128. New avatar code should take care of this.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 05:19:25 +01:00
Morris Jobke eabddef08d
clone name indicator
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 05:16:15 +01:00
Lukas Reschke 616886b93b
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 05:11:55 +01:00
Lukas Reschke b83da753c9
Use data channels for speech detection
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 05:11:36 +01:00
Roeland Jago Douma 6af28bdec4
Increase avatar size and show own avatar on mute
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 05:11:10 +01:00
Morris Jobke 6e621caa0a
add name indicator to dummy
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 05:10:52 +01:00
Morris Jobke 96f7420f05
better debug logs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 05:06:40 +01:00
Morris Jobke f1b91a56dc
debug the 💩 out of it
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 05:06:40 +01:00
Jan-Christoph Borchardt 072de698e5 first styling of mute indicator
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 05:02:42 +01:00
Lukas Reschke e2d05e97d3
Enable data channels
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 04:45:09 +01:00
Roeland Jago Douma b376c003ac
Avatar container
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 04:41:17 +01:00
Morris Jobke cac6b5496d
push the video container dummy next to the promoted container not into
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:40:08 +01:00
Morris Jobke b12886116c
fix yet another typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:36:46 +01:00
Morris Jobke ff3a443f81
fix another typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:33:44 +01:00
Morris Jobke f85878f275
fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:32:43 +01:00
Morris Jobke 694715f877
Promote first peer that joins
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:29:58 +01:00
Roeland Jago Douma e8b4751606
Do not hide video
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 04:24:17 +01:00
Morris Jobke 0d661dbc77
add dummy container
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:22:32 +01:00
Roeland Jago Douma ace5823184
Add audio mute indicator
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 04:20:45 +01:00
Roeland Jago Douma dd5390fb34
If video is muted show the users avatar
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 04:20:29 +01:00
Morris Jobke 1ebba9ea0f
handle non-string id properly
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:11:47 +01:00
Roeland Jago Douma 5b0d4b160c
Fix js code
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-17 04:03:10 +01:00
Morris Jobke 350350da26
donot promote yourself and avoid invalid id
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 04:01:58 +01:00
Morris Jobke 251a61ec63
also promote yourself
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:59:08 +01:00
Morris Jobke b1b12db4ac
Video elements cannot be used - apply class instead
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:54:39 +01:00
Morris Jobke 6c049fff3d
fix variable access
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:44:27 +01:00
Morris Jobke 95f90fa369
show proper names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:39:40 +01:00
Morris Jobke 8aa4e217f0
provide status method
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:37:11 +01:00
Morris Jobke b59b28e7c0
Properly remove peer and add placeholder for promoted speaker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:26:48 +01:00
Morris Jobke c23e76a82e
properly change DOM elements to promote user
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-17 03:18:52 +01:00
Lukas Reschke d979c930e1
Add mapping table
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 02:56:10 +01:00
Lukas Reschke d1147f7af9
Merge branch 'master' of https://github.com/nextcloud/spreed 2016-11-17 02:44:15 +01:00
Lukas Reschke 742aaec2f9
Promote speaker
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-17 02:44:08 +01:00