Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ef6a5711

Commit ef6a5711 authored 4 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/livestream' into 'master'

Live web service streaming from GUI

See merge request nicolas.pope/ftl!303

parents f1ce8ede a8181860

No related branches found

No related tags found

1 merge request!303Live web service streaming from GUI

Pipeline #26611 passed 4 years ago

Stage: all

Stage: deploy

Changes 11
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui/src/camera.cpp 25 additions, 6 deletions

applications/gui/src/camera.cpp
applications/gui/src/camera.hpp 5 additions, 2 deletions

applications/gui/src/camera.hpp
applications/gui/src/media_panel.cpp 11 additions, 2 deletions

applications/gui/src/media_panel.cpp
applications/gui/src/media_panel.hpp 3 additions, 1 deletion

applications/gui/src/media_panel.hpp
components/net/cpp/src/ws_internal.cpp 1 addition, 1 deletion

components/net/cpp/src/ws_internal.cpp
components/streams/include/ftl/streams/stream.hpp 2 additions, 0 deletions

components/streams/include/ftl/streams/stream.hpp
components/streams/src/netstream.cpp 4 additions, 1 deletion

components/streams/src/netstream.cpp
components/streams/src/stream.cpp 22 additions, 2 deletions

components/streams/src/stream.cpp
web-service/public/js/bundle.js 137 additions, 105 deletions

web-service/public/js/bundle.js
web-service/public/js/index.js 33 additions, 8 deletions

web-service/public/js/index.js
web-service/server/src/index.js 11 additions, 6 deletions

web-service/server/src/index.js

with 254 additions and 134 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment