diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-01-20 01:20:41 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-01-20 01:20:41 +0100 |
| commit | 28ddaa742d1a815c8c07d17b2a79fbfb964fdc1d (patch) | |
| tree | f22941e989bb775aacda52876c97ada7b899a7dd /src/Flowgraph.h | |
| parent | 95f556cf0797ab4c23f431e5c8c5accfa7f4c30b (diff) | |
| parent | f52b0e13f61a947c26236504ffb4b072352abc04 (diff) | |
| download | dabmod-28ddaa742d1a815c8c07d17b2a79fbfb964fdc1d.tar.gz dabmod-28ddaa742d1a815c8c07d17b2a79fbfb964fdc1d.tar.bz2 dabmod-28ddaa742d1a815c8c07d17b2a79fbfb964fdc1d.zip | |
Merge branch 'outputRefactoring' into next
Diffstat (limited to 'src/Flowgraph.h')
| -rw-r--r-- | src/Flowgraph.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Flowgraph.h b/src/Flowgraph.h index ebb7314..b074ee6 100644 --- a/src/Flowgraph.h +++ b/src/Flowgraph.h @@ -2,7 +2,7 @@ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2016 + Copyright (C) 2018 Matthias P. Braendli, matthias.braendli@mpb.li http://opendigitalradio.org @@ -39,6 +39,8 @@ #include <list> #include <cstdio> +using Metadata_vec_sptr = std::shared_ptr<std::vector<flowgraph_metadata> >; + class Node { public: @@ -55,15 +57,18 @@ public: myProcessTime += processTime; } - void addOutputBuffer(Buffer::sptr& buffer); - void removeOutputBuffer(Buffer::sptr& buffer); + void addOutputBuffer(Buffer::sptr& buffer, Metadata_vec_sptr& md); + void removeOutputBuffer(Buffer::sptr& buffer, Metadata_vec_sptr& md); - void addInputBuffer(Buffer::sptr& buffer); - void removeInputBuffer(Buffer::sptr& buffer); + void addInputBuffer(Buffer::sptr& buffer, Metadata_vec_sptr& md); + void removeInputBuffer(Buffer::sptr& buffer, Metadata_vec_sptr& md); protected: std::list<Buffer::sptr> myInputBuffers; std::list<Buffer::sptr> myOutputBuffers; + std::list<Metadata_vec_sptr> myInputMetadata; + std::list<Metadata_vec_sptr> myOutputMetadata; + #if DEBUG std::list<FILE*> myDebugFiles; #endif @@ -85,6 +90,7 @@ protected: std::shared_ptr<Node> mySrcNode; std::shared_ptr<Node> myDstNode; std::shared_ptr<Buffer> myBuffer; + std::shared_ptr<std::vector<flowgraph_metadata> > myMetadata; }; |