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

68f439d5

Commit 68f439d5 authored 4 years ago by Sebastian Hahta

Downloads
- Plain Diff

Merge branch 'master' of gitlab.utu.fi:nicolas.pope/ftl

parents f830e12d 74235813

No related branches found

No related tags found

No related merge requests found

Pipeline #28641 passed 4 years ago

Stage: all

Stage: deploy

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 24 additions, 22 deletions

CMakeLists.txt
applications/gui2/src/views/addsource.hpp 1 addition, 1 deletion

applications/gui2/src/views/addsource.hpp
components/audio/CMakeLists.txt 3 additions, 2 deletions

components/audio/CMakeLists.txt
components/audio/include/ftl/audio/buffer.hpp 9 additions, 3 deletions

components/audio/include/ftl/audio/buffer.hpp
components/audio/include/ftl/audio/mixer.hpp 158 additions, 0 deletions

components/audio/include/ftl/audio/mixer.hpp
components/audio/test/CMakeLists.txt 11 additions, 0 deletions

components/audio/test/CMakeLists.txt
components/audio/test/mixer_unit.cpp 133 additions, 0 deletions

components/audio/test/mixer_unit.cpp
components/streams/src/renderers/screen_render.cpp 25 additions, 1 deletion

components/streams/src/renderers/screen_render.cpp
components/streams/src/renderers/screen_render.hpp 10 additions, 0 deletions

components/streams/src/renderers/screen_render.hpp

with 374 additions and 29 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