Change RC showjson command

19 files changed, 29 insertions, 29 deletions

diff --git a/src/DabModulator.cpp b/src/DabModulator.cpp
index 5213d8d..0fe9c6d 100644
--- a/src/DabModulator.cpp
+++ b/src/DabModulator.cpp
@@ -435,9 +435,9 @@ const string DabModulator::get_parameter(const string& parameter) const
     return ss.str();
 }
 
-const RemoteControllable::map_t DabModulator::get_all_values() const
+const json::map_t DabModulator::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     map["rate"] = m_settings.outputRate;
     map["num_clipped_samples"] = m_formatConverter ? m_formatConverter->get_num_clipped_samples() : 0;
     return map;
diff --git a/src/DabModulator.h b/src/DabModulator.h
index 6381252..140f313 100644
--- a/src/DabModulator.h
+++ b/src/DabModulator.h
@@ -64,7 +64,7 @@ public:
     /******* REMOTE CONTROL ********/
     virtual void set_parameter(const std::string& parameter, const std::string& value) override;
     virtual const std::string get_parameter(const std::string& parameter) const override;
-    virtual const RemoteControllable::map_t get_all_values() const override;
+    virtual const json::map_t get_all_values() const override;
 
 protected:
     void setMode(unsigned mode);
diff --git a/src/FIRFilter.cpp b/src/FIRFilter.cpp
index 523d405..d2a6121 100644
--- a/src/FIRFilter.cpp
+++ b/src/FIRFilter.cpp
@@ -347,9 +347,9 @@ const string FIRFilter::get_parameter(const string& parameter) const
     return ss.str();
 }
 
-const RemoteControllable::map_t FIRFilter::get_all_values() const
+const json::map_t FIRFilter::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     map["ntaps"] = m_taps.size();
     map["tapsfile"] = m_taps_file;
     return map;
diff --git a/src/FIRFilter.h b/src/FIRFilter.h
index 2a469aa..a4effa1 100644
--- a/src/FIRFilter.h
+++ b/src/FIRFilter.h
@@ -61,7 +61,7 @@ public:
     /******* REMOTE CONTROL ********/
     virtual void set_parameter(const std::string& parameter, const std::string& value) override;
     virtual const std::string get_parameter(const std::string& parameter) const override;
-    virtual const RemoteControllable::map_t get_all_values() const override;
+    virtual const json::map_t get_all_values() const override;
 
 protected:
     virtual int internal_process(Buffer* const dataIn, Buffer* dataOut) override;
diff --git a/src/GainControl.cpp b/src/GainControl.cpp
index d90da45..beb93f6 100644
--- a/src/GainControl.cpp
+++ b/src/GainControl.cpp
@@ -583,9 +583,9 @@ const string GainControl::get_parameter(const string& parameter) const
     return ss.str();
 }
 
-const RemoteControllable::map_t GainControl::get_all_values() const
+const json::map_t GainControl::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     map["digital"] = m_digGain;
     switch (m_gainmode) {
         case GainMode::GAIN_FIX:
diff --git a/src/GainControl.h b/src/GainControl.h
index f024fa2..04f6b58 100644
--- a/src/GainControl.h
+++ b/src/GainControl.h
@@ -66,7 +66,7 @@ class GainControl : public PipelinedModCodec, public RemoteControllable
         /* Functions for the remote control */
         virtual void set_parameter(const std::string& parameter, const std::string& value) override;
         virtual const std::string get_parameter(const std::string& parameter) const override;
-        virtual const RemoteControllable::map_t get_all_values() const override;
+        virtual const json::map_t get_all_values() const override;
 
     protected:
         virtual int internal_process(
diff --git a/src/GuardIntervalInserter.cpp b/src/GuardIntervalInserter.cpp
index d5c71fb..80394b7 100644
--- a/src/GuardIntervalInserter.cpp
+++ b/src/GuardIntervalInserter.cpp
@@ -303,9 +303,9 @@ const std::string GuardIntervalInserter::get_parameter(const std::string& parame
     return ss.str();
 }
 
-const RemoteControllable::map_t GuardIntervalInserter::get_all_values() const
+const json::map_t GuardIntervalInserter::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     map["windowlen"] = d_windowOverlap;
     return map;
 }
diff --git a/src/GuardIntervalInserter.h b/src/GuardIntervalInserter.h
index f88bdac..5aaad2b 100644
--- a/src/GuardIntervalInserter.h
+++ b/src/GuardIntervalInserter.h
@@ -58,7 +58,7 @@ class GuardIntervalInserter : public ModCodec, public RemoteControllable
         /******* REMOTE CONTROL ********/
         virtual void set_parameter(const std::string& parameter, const std::string& value) override;
         virtual const std::string get_parameter(const std::string& parameter) const override;
-        virtual const RemoteControllable::map_t get_all_values() const override;
+        virtual const json::map_t get_all_values() const override;
 
     protected:
         void update_window(size_t new_window_overlap);
diff --git a/src/MemlessPoly.cpp b/src/MemlessPoly.cpp
index a2b0082..30d4ce9 100644
--- a/src/MemlessPoly.cpp
+++ b/src/MemlessPoly.cpp
@@ -467,9 +467,9 @@ const string MemlessPoly::get_parameter(const string& parameter) const
     return ss.str();
 }
 
-const RemoteControllable::map_t MemlessPoly::get_all_values() const
+const json::map_t MemlessPoly::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     map["ncoefs"] = m_coefs_am.size();
     map["coefs"] = serialise_coefficients();
     map["coeffile"] = m_coefs_file;
diff --git a/src/MemlessPoly.h b/src/MemlessPoly.h
index 09adc13..91e6860 100644
--- a/src/MemlessPoly.h
+++ b/src/MemlessPoly.h
@@ -68,7 +68,7 @@ public:
     /******* REMOTE CONTROL ********/
     virtual void set_parameter(const std::string& parameter, const std::string& value) override;
     virtual const std::string get_parameter(const std::string& parameter) const override;
-    virtual const RemoteControllable::map_t get_all_values() const override;
+    virtual const json::map_t get_all_values() const override;
 
 private:
     int internal_process(Buffer* const dataIn, Buffer* dataOut) override;
diff --git a/src/OfdmGenerator.cpp b/src/OfdmGenerator.cpp
index d161861..cb799d3 100644
--- a/src/OfdmGenerator.cpp
+++ b/src/OfdmGenerator.cpp
@@ -458,9 +458,9 @@ const std::string OfdmGenerator::get_parameter(const std::string& parameter) con
     return ss.str();
 }
 
-const RemoteControllable::map_t OfdmGenerator::get_all_values() const
+const json::map_t OfdmGenerator::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     // TODO needs rework of the values
     return map;
 }
diff --git a/src/OfdmGenerator.h b/src/OfdmGenerator.h
index 90e562a..dc1ad46 100644
--- a/src/OfdmGenerator.h
+++ b/src/OfdmGenerator.h
@@ -61,7 +61,7 @@ class OfdmGenerator : public ModCodec, public RemoteControllable
         /* Functions for the remote control */
         virtual void set_parameter(const std::string& parameter, const std::string& value) override;
         virtual const std::string get_parameter(const std::string& parameter) const override;
-        virtual const RemoteControllable::map_t get_all_values() const override;
+        virtual const json::map_t get_all_values() const override;
 
     protected:
         struct cfr_iter_stat_t {
diff --git a/src/TII.cpp b/src/TII.cpp
index b329cdb..9068630 100644
--- a/src/TII.cpp
+++ b/src/TII.cpp
@@ -385,9 +385,9 @@ const std::string TII::get_parameter(const std::string& parameter) const
     return ss.str();
 }
 
-const RemoteControllable::map_t TII::get_all_values() const
+const json::map_t TII::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     map["enable"] = m_conf.enable;
     map["pattern"] = m_conf.pattern;
     map["comb"] = m_conf.comb;
diff --git a/src/TII.h b/src/TII.h
index b0ba646..a8d0ca9 100644
--- a/src/TII.h
+++ b/src/TII.h
@@ -89,7 +89,7 @@ class TII : public ModCodec, public RemoteControllable
         /******* REMOTE CONTROL ********/
         virtual void set_parameter(const std::string& parameter, const std::string& value) override;
         virtual const std::string get_parameter(const std::string& parameter) const override;
-        virtual const RemoteControllable::map_t get_all_values() const override;
+        virtual const json::map_t get_all_values() const override;
 
     protected:
         // Fill m_Acp with the correct carriers for the pattern/comb
diff --git a/src/TimestampDecoder.cpp b/src/TimestampDecoder.cpp
index 149cd50..4277e55 100644
--- a/src/TimestampDecoder.cpp
+++ b/src/TimestampDecoder.cpp
@@ -301,9 +301,9 @@ const std::string TimestampDecoder::get_parameter(
     return ss.str();
 }
 
-const RemoteControllable::map_t TimestampDecoder::get_all_values() const
+const json::map_t TimestampDecoder::get_all_values() const
 {
-    map_t map;
+    json::map_t map;
     map["offset"] = timestamp_offset;
     if (full_timestamp_received) {
         map["timestamp"] = time_secs + ((double)time_pps / 16384000.0);
diff --git a/src/TimestampDecoder.h b/src/TimestampDecoder.h
index dc5aa78..b90c328 100644
--- a/src/TimestampDecoder.h
+++ b/src/TimestampDecoder.h
@@ -120,7 +120,7 @@ class TimestampDecoder : public RemoteControllable
         /* Base function to set parameters. */
         virtual void set_parameter(const std::string& parameter, const std::string& value) override;
         virtual const std::string get_parameter(const std::string& parameter) const override;
-        virtual const RemoteControllable::map_t get_all_values() const override;
+        virtual const json::map_t get_all_values() const override;
 
         const char* name() { return "TS"; }
 
diff --git a/src/output/SDR.cpp b/src/output/SDR.cpp
index 11321f2..4fc3277 100644
--- a/src/output/SDR.cpp
+++ b/src/output/SDR.cpp
@@ -450,7 +450,7 @@ const string SDR::get_parameter(const string& parameter) const
         if (m_device) {
             const auto stat = m_device->get_run_statistics();
             try {
-                const auto& value = stat.at(parameter);
+                const auto& value = stat.at(parameter).data;
                 if (std::holds_alternative<string>(value)) {
                     ss << std::get<string>(value);
                 }
@@ -485,9 +485,9 @@ const string SDR::get_parameter(const string& parameter) const
     return ss.str();
 }
 
-const RemoteControllable::map_t SDR::get_all_values() const
+const json::map_t SDR::get_all_values() const
 {
-    map_t stat = m_device->get_run_statistics();
+    json::map_t stat = m_device->get_run_statistics();
 
     stat["txgain"] = m_config.txgain;
     stat["rxgain"] = m_config.rxgain;
diff --git a/src/output/SDR.h b/src/output/SDR.h
index 94c972b..960de0c 100644
--- a/src/output/SDR.h
+++ b/src/output/SDR.h
@@ -67,7 +67,7 @@ class SDR : public ModOutput, public ModMetadata, public RemoteControllable {
         virtual const std::string get_parameter(
                 const std::string& parameter) const override;
 
-        virtual const RemoteControllable::map_t get_all_values() const override;
+        virtual const json::map_t get_all_values() const override;
 
     private:
         void process_thread_entry(void);
diff --git a/src/output/SDRDevice.h b/src/output/SDRDevice.h
index f84b340..f728d8b 100644
--- a/src/output/SDRDevice.h
+++ b/src/output/SDRDevice.h
@@ -116,7 +116,7 @@ struct FrameData {
 // All SDR Devices must implement the SDRDevice interface
 class SDRDevice {
     public:
-        using run_statistics_t = RemoteControllable::map_t;
+        using run_statistics_t = json::map_t;
 
         virtual void tune(double lo_offset, double frequency) = 0;
         virtual double get_tx_freq(void) const = 0;