From 409ec7f6899693fb7f1c141945f83fe6cfa41827 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 6 Jan 2025 22:11:12 +0100
Subject: Move some constants around

---
 src/ConfigParser.cpp   | 11 +++++++----
 src/DabMultiplexer.cpp |  2 +-
 src/DabMultiplexer.h   | 19 +------------------
 src/fig/FIG0structs.h  | 18 ++++++++----------
 src/utils.cpp          |  1 -
 5 files changed, 17 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index 74e627b..7d166b6 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -36,16 +36,13 @@
 #   include "config.h"
 #endif
 
-#include "dabOutput/dabOutput.h"
 #include "utils.h"
-#include "DabMux.h"
-#include "ManagementServer.h"
 #include "input/Edi.h"
 #include "input/Prbs.h"
 #include "input/Zmq.h"
 #include "input/File.h"
 #include "input/Udp.h"
-#include "Eti.h"
+#include "fig/FIG0structs.h"
 #include <boost/property_tree/ptree.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -63,6 +60,12 @@ using namespace std;
 using boost::property_tree::ptree;
 using boost::property_tree::ptree_error;
 
+constexpr uint16_t DEFAULT_DATA_BITRATE = 384;
+constexpr uint16_t DEFAULT_PACKET_BITRATE = 32;
+
+constexpr uint32_t DEFAULT_SERVICE_ID = 50;
+
+
 static void setup_subchannel_from_ptree(shared_ptr<DabSubchannel>& subchan,
         const ptree &pt,
         std::shared_ptr<dabEnsemble> ensemble,
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index 87cccd4..e84bfbf 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -3,7 +3,7 @@
    2011, 2012 Her Majesty the Queen in Right of Canada (Communications
    Research Center Canada)
 
-   Copyright (C) 2024
+   Copyright (C) 2025
    Matthias P. Braendli, matthias.braendli@mpb.li
    */
 /*
diff --git a/src/DabMultiplexer.h b/src/DabMultiplexer.h
index d3cdb75..92fa2c0 100644
--- a/src/DabMultiplexer.h
+++ b/src/DabMultiplexer.h
@@ -3,7 +3,7 @@
    2011, 2012 Her Majesty the Queen in Right of Canada (Communications
    Research Center Canada)
 
-   Copyright (C) 2024
+   Copyright (C) 2025
    Matthias P. Braendli, matthias.braendli@mpb.li
    */
 /*
@@ -118,20 +118,3 @@ class DabMultiplexer : public RemoteControllable {
         /* New FIG Carousel */
         FIC::FIGCarousel fig_carousel;
 };
-
-// Data bitrate in kbits/s. Must be 64 kb/s multiple.
-#define DEFAULT_DATA_BITRATE    384
-#define DEFAULT_PACKET_BITRATE  32
-
-/* default ensemble parameters. Label must be max 16 chars, short label
- * a subset of the label, max 8 chars
- */
-#define DEFAULT_ENSEMBLE_LABEL          "ODR Dab Mux"
-#define DEFAULT_ENSEMBLE_SHORT_LABEL    "ODRMux"
-#define DEFAULT_ENSEMBLE_ID             0xc000
-#define DEFAULT_ENSEMBLE_ECC            0xa1
-
-// start value for default service IDs (if not overridden by configuration)
-#define DEFAULT_SERVICE_ID      50
-#define DEFAULT_PACKET_ADDRESS  0
-
diff --git a/src/fig/FIG0structs.h b/src/fig/FIG0structs.h
index 5f514b3..2e107e8 100644
--- a/src/fig/FIG0structs.h
+++ b/src/fig/FIG0structs.h
@@ -24,19 +24,17 @@
 */
 
 #pragma once
-
 #include <cstdint>
-
 #include "fig/FIG.h"
 
-#define FIG0_13_APPTYPE_SLIDESHOW  0x2
-#define FIG0_13_APPTYPE_WEBSITE    0x3
-#define FIG0_13_APPTYPE_TPEG       0x4
-#define FIG0_13_APPTYPE_DGPS       0x5
-#define FIG0_13_APPTYPE_TMC        0x6
-#define FIG0_13_APPTYPE_SPI        0x7
-#define FIG0_13_APPTYPE_DABJAVA    0x8
-#define FIG0_13_APPTYPE_JOURNALINE 0x44a
+constexpr uint16_t FIG0_13_APPTYPE_SLIDESHOW  = 0x2;
+constexpr uint16_t FIG0_13_APPTYPE_WEBSITE    = 0x3;
+constexpr uint16_t FIG0_13_APPTYPE_TPEG       = 0x4;
+constexpr uint16_t FIG0_13_APPTYPE_DGPS       = 0x5;
+constexpr uint16_t FIG0_13_APPTYPE_TMC        = 0x6;
+constexpr uint16_t FIG0_13_APPTYPE_SPI        = 0x7;
+constexpr uint16_t FIG0_13_APPTYPE_DABJAVA    = 0x8;
+constexpr uint16_t FIG0_13_APPTYPE_JOURNALINE = 0x44a;
 
 
 struct FIGtype0 {
diff --git a/src/utils.cpp b/src/utils.cpp
index e7ef224..1a13caf 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -29,7 +29,6 @@
 #include <iostream>
 #include <memory>
 #include <boost/algorithm/string/join.hpp>
-#include "DabMux.h"
 #include "utils.h"
 #include "fig/FIG0structs.h"
 
-- 
cgit v1.2.3