From 4870d0c148eb49ffeb5482ae55d9cc4c9cc89786 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 3 Jul 2017 17:20:35 +0200
Subject: Measure audio levels, add ensemble database WIP

---
 src/etianalyse.hpp | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'src/etianalyse.hpp')

diff --git a/src/etianalyse.hpp b/src/etianalyse.hpp
index 40a19fe..7d02071 100644
--- a/src/etianalyse.hpp
+++ b/src/etianalyse.hpp
@@ -16,9 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-    etisnoop.cpp
-          Parse ETI NI G.703 file
-
     Authors:
          Sergio Sagliocco <sergio.sagliocco@csp.it>
          Matthias P. Braendli <matthias@mpb.li>
@@ -43,6 +40,7 @@
 #include "watermarkdecoder.hpp"
 #include "repetitionrate.hpp"
 #include "figalyser.hpp"
+#include "ensembledatabase.hpp"
 
 extern std::atomic<bool> quit;
 
@@ -54,7 +52,8 @@ struct eti_analyse_config_t {
         analyse_fic_carousel(false),
         analyse_fig_rates(false),
         analyse_fig_rates_per_second(false),
-        decode_watermark(false) {}
+        decode_watermark(false),
+        statistics(false) {}
 
     FILE* etifd;
     bool ignore_error;
@@ -64,19 +63,30 @@ struct eti_analyse_config_t {
     bool analyse_fig_rates;
     bool analyse_fig_rates_per_second;
     bool decode_watermark;
+    bool statistics;
 
     bool is_fig_to_be_printed(int type, int extension) const;
 };
 
+class ETI_Analyser {
+    public:
+        ETI_Analyser(eti_analyse_config_t &config) :
+            config(config) {}
+
+        void eti_analyse(void);
 
-int eti_analyse(eti_analyse_config_t &config);
+    private:
+        void decodeFIG(
+                const eti_analyse_config_t &config,
+                FIGalyser &figs,
+                uint8_t* f,
+                uint8_t figlen,
+                uint16_t figtype,
+                int indent);
 
-void decodeFIG(
-        const eti_analyse_config_t &config,
-        FIGalyser &figs,
-        WatermarkDecoder &wm_decoder,
-        uint8_t* f,
-        uint8_t figlen,
-        uint16_t figtype,
-        int indent);
+        eti_analyse_config_t &config;
+
+        ensemble_t ensemble;
+        WatermarkDecoder wm_decoder;
+};
 
-- 
cgit v1.2.3