From 1d833b718845b97a5b1d90f33b547b1772bc0708 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 7 Jan 2018 08:49:29 +0100
Subject: Add new flowgraph path for metadata

---
 src/Flowgraph.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/Flowgraph.h')

diff --git a/src/Flowgraph.h b/src/Flowgraph.h
index ebb7314..2742824 100644
--- a/src/Flowgraph.h
+++ b/src/Flowgraph.h
@@ -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;
 };
 
 
-- 
cgit v1.2.3


From 7ddaefab49e31a3ff360225b929633e7be161947 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 7 Jan 2018 11:50:35 +0100
Subject: Avoid some includes, remove unused variables, update comments

---
 src/BlockPartitioner.cpp | 1 -
 src/Flowgraph.cpp        | 3 +--
 src/Flowgraph.h          | 2 +-
 src/Resampler.h          | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/Flowgraph.h')

diff --git a/src/BlockPartitioner.cpp b/src/BlockPartitioner.cpp
index 54405d9..5767650 100644
--- a/src/BlockPartitioner.cpp
+++ b/src/BlockPartitioner.cpp
@@ -27,7 +27,6 @@
 #include "BlockPartitioner.h"
 #include "PcDebug.h"
 #include "Log.h"
-#include "TimestampDecoder.h"
 
 #include <stdio.h>
 #include <stdexcept>
diff --git a/src/Flowgraph.cpp b/src/Flowgraph.cpp
index 0b80a8c..e12ff1e 100644
--- a/src/Flowgraph.cpp
+++ b/src/Flowgraph.cpp
@@ -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
@@ -27,7 +27,6 @@
 #include "Flowgraph.h"
 #include "PcDebug.h"
 #include "Log.h"
-#include "TimestampDecoder.h"
 #include <string>
 #include <memory>
 #include <algorithm>
diff --git a/src/Flowgraph.h b/src/Flowgraph.h
index 2742824..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
diff --git a/src/Resampler.h b/src/Resampler.h
index d9d9d89..ed94a8c 100644
--- a/src/Resampler.h
+++ b/src/Resampler.h
@@ -59,7 +59,6 @@ protected:
     FFT_PLAN myFftPlan2;
     size_t L;
     size_t M;
-    size_t K;
     size_t myFftSizeIn;
     size_t myFftSizeOut;
     FFT_TYPE* myFftIn;
-- 
cgit v1.2.3