Skip to content
Snippets Groups Projects
Commit acffba67 authored by Sebastian Hahta's avatar Sebastian Hahta
Browse files

build fixes (feed)

parent e944c40c
Branches
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
Pipeline #27460 failed
......@@ -10,6 +10,7 @@ set(STREAMSRC
src/filestream.cpp
src/receiver.cpp
src/sender.cpp
src/feed.cpp
src/netstream.cpp
src/injectors.cpp
src/parsers.cpp
......
......@@ -3,6 +3,11 @@
#include <ftl/configurable.hpp>
#include <ftl/handle.hpp>
#include <ftl/rgbd/source.hpp>
#include <ftl/streams/stream.hpp>
#include <ftl/streams/new_receiver.hpp>
#include <ftl/streams/new_sender.hpp>
#include <ftl/data/new_frameset.hpp>
namespace ftl {
......@@ -13,7 +18,7 @@ using FrameSetHandler = std::function<bool(ftl::data::FrameSet&)>;
class Feed : public ftl::Configurable {
public:
void add(ftl::streams::Stream *s);
void add(ftl::stream::Stream *s);
void add(ftl::rgbd::Source *s);
void add(const std::string &uri);
......
#ifndef _FTL_STREAMS_NRECEIVER_HPP_
#define _FTL_STREAMS_NRECEIVER_HPP_
#include <ftl/data/new_frameset.hpp>
namespace ftl {
namespace streams {
......
......@@ -3,9 +3,8 @@
#include <ftl/configuration.hpp>
#include <ftl/configurable.hpp>
#include <ftl/rgbd/source.hpp>
//#include <ftl/rgbd/source.hpp>
//#include <ftl/rgbd/group.hpp>
#include <ftl/net/universe.hpp>
#include <ftl/codecs/encoder.hpp>
#include <ftl/threads.hpp>
#include <string>
......
#include <ftl/streams/feed.hpp>
using ftl::streams::Feed;
......@@ -77,3 +77,16 @@ target_link_libraries(builder_unit
ftlcommon ftldata)
add_test(BuilderUnitTest builder_unit)
### Feed Unit ##################################################################
add_executable(feed_unit
$<TARGET_OBJECTS:CatchTest>
./feed_unit.cpp
../src/feed.cpp
)
target_include_directories(feed_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include")
target_link_libraries(feed_unit
ftlrgbd ftlcommon ftldata)
add_test(MemPoolUnitTest feed_unit)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment