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

3c188c31

Commit 3c188c31 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/snapshot-video' into 'master'

Feature/Snapshot Video

Closes #153

See merge request nicolas.pope/ftl!93

parents db693df7 d7d46c05

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/groupview/src/main.cpp 32 additions, 20 deletions

applications/groupview/src/main.cpp
applications/gui/src/media_panel.cpp 56 additions, 59 deletions

applications/gui/src/media_panel.cpp
components/rgbd-sources/include/ftl/rgbd/snapshot.hpp 43 additions, 21 deletions

components/rgbd-sources/include/ftl/rgbd/snapshot.hpp
components/rgbd-sources/src/snapshot.cpp 268 additions, 102 deletions

components/rgbd-sources/src/snapshot.cpp
components/rgbd-sources/src/snapshot_source.cpp 16 additions, 11 deletions

components/rgbd-sources/src/snapshot_source.cpp
components/rgbd-sources/src/snapshot_source.hpp 6 additions, 1 deletion

components/rgbd-sources/src/snapshot_source.hpp
components/rgbd-sources/src/source.cpp 2 additions, 1 deletion

components/rgbd-sources/src/source.cpp
components/rgbd-sources/test/source_unit.cpp 4 additions, 1 deletion

components/rgbd-sources/test/source_unit.cpp

with 427 additions and 216 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