From 4c6f75eb75292a7915cc490738d63dbca3f3109f Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 9 Jun 2020 14:18:43 +0200
Subject: [PATCH] Move hpp to correct folder

---
 sf-stream/{src => include}/ZmqLiveSender.hpp | 19 +------------------
 sf-stream/src/ZmqLiveSender.cpp              | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 18 deletions(-)
 rename sf-stream/{src => include}/ZmqLiveSender.hpp (59%)

diff --git a/sf-stream/src/ZmqLiveSender.hpp b/sf-stream/include/ZmqLiveSender.hpp
similarity index 59%
rename from sf-stream/src/ZmqLiveSender.hpp
rename to sf-stream/include/ZmqLiveSender.hpp
index ba7d0a1..6db77fa 100644
--- a/sf-stream/src/ZmqLiveSender.hpp
+++ b/sf-stream/include/ZmqLiveSender.hpp
@@ -22,24 +22,7 @@ struct LiveStreamConfig {
     const int n_modules;
 };
 
-LiveStreamConfig read_json_config(const std::string filename)
-{
-    std::ifstream ifs(filename);
-    rapidjson::IStreamWrapper isw(ifs);
-    rapidjson::Document config_parameters;
-    config_parameters.ParseStream(isw);
-
-    return {
-        config_parameters["streamvis_stream"].GetString(),
-        config_parameters["streamvis_rate"].GetInt(),
-        config_parameters["live_stream"].GetString(),
-        config_parameters["live_rate"].GetInt(),
-        config_parameters["pedestal_file"].GetString(),
-        config_parameters["gain_file"].GetString(),
-        config_parameters["detector_name"].GetString(),
-        config_parameters["n_modules"].GetInt()
-    };
-}
+LiveStreamConfig read_json_config(const std::string filename);
 
 class ZmqLiveSender {
     const void* ctx_;
diff --git a/sf-stream/src/ZmqLiveSender.cpp b/sf-stream/src/ZmqLiveSender.cpp
index bdf7c28..6538f64 100644
--- a/sf-stream/src/ZmqLiveSender.cpp
+++ b/sf-stream/src/ZmqLiveSender.cpp
@@ -5,6 +5,25 @@
 
 using namespace std;
 
+LiveStreamConfig read_json_config(const std::string filename)
+{
+    std::ifstream ifs(filename);
+    rapidjson::IStreamWrapper isw(ifs);
+    rapidjson::Document config_parameters;
+    config_parameters.ParseStream(isw);
+
+    return {
+            config_parameters["streamvis_stream"].GetString(),
+            config_parameters["streamvis_rate"].GetInt(),
+            config_parameters["live_stream"].GetString(),
+            config_parameters["live_rate"].GetInt(),
+            config_parameters["pedestal_file"].GetString(),
+            config_parameters["gain_file"].GetString(),
+            config_parameters["detector_name"].GetString(),
+            config_parameters["n_modules"].GetInt()
+    };
+}
+
 ZmqLiveSender::ZmqLiveSender(
         void* ctx,
         const LiveStreamConfig& config) :