aboutsummaryrefslogtreecommitdiffstats
path: root/src/fig
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-07-24 16:29:18 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-07-24 16:29:18 +0200
commitbdde4ddf6963eed59d6830ca648edf3548ed7d7d (patch)
tree5afb7d31ed8a407f2e4fc5e9b09ca5e04afe6147 /src/fig
parentc336362fab1711126d1b548486105e09de9d69a0 (diff)
downloaddabmux-bdde4ddf6963eed59d6830ca648edf3548ed7d7d.tar.gz
dabmux-bdde4ddf6963eed59d6830ca648edf3548ed7d7d.tar.bz2
dabmux-bdde4ddf6963eed59d6830ca648edf3548ed7d7d.zip
Change FIG interface function signatures
Diffstat (limited to 'src/fig')
-rw-r--r--src/fig/FIG.h8
-rw-r--r--src/fig/FIG0_0.h6
-rw-r--r--src/fig/FIG0_1.h6
-rw-r--r--src/fig/FIG0_10.h6
-rw-r--r--src/fig/FIG0_13.h6
-rw-r--r--src/fig/FIG0_17.h6
-rw-r--r--src/fig/FIG0_18.h6
-rw-r--r--src/fig/FIG0_19.cpp2
-rw-r--r--src/fig/FIG0_19.h6
-rw-r--r--src/fig/FIG0_2.h6
-rw-r--r--src/fig/FIG0_21.h6
-rw-r--r--src/fig/FIG0_24.h6
-rw-r--r--src/fig/FIG0_3.h6
-rw-r--r--src/fig/FIG0_5.h6
-rw-r--r--src/fig/FIG0_6.h8
-rw-r--r--src/fig/FIG0_8.h6
-rw-r--r--src/fig/FIG0_9.h6
-rw-r--r--src/fig/FIG1.h24
18 files changed, 63 insertions, 63 deletions
diff --git a/src/fig/FIG.h b/src/fig/FIG.h
index 416ae44..116ac8b 100644
--- a/src/fig/FIG.h
+++ b/src/fig/FIG.h
@@ -90,12 +90,12 @@ class IFIG
public:
virtual FillStatus fill(uint8_t *buf, size_t max_size) = 0;
- virtual FIG_rate repetition_rate(void) = 0;
+ virtual FIG_rate repetition_rate() const = 0;
- virtual const int figtype(void) const = 0;
- virtual const int figextension(void) const = 0;
+ virtual int figtype() const = 0;
+ virtual int figextension() const = 0;
- virtual const std::string name(void) const
+ virtual const std::string name() const
{
std::stringstream ss;
ss << figtype() << "/" << figextension();
diff --git a/src/fig/FIG0_0.h b/src/fig/FIG0_0.h
index abed53a..f2642bb 100644
--- a/src/fig/FIG0_0.h
+++ b/src/fig/FIG0_0.h
@@ -37,10 +37,10 @@ class FIG0_0 : public IFIG
FIG0_0(FIGRuntimeInformation* rti) :
m_rti(rti) {}
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::FIG0_0; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::FIG0_0; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 0; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 0; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_1.h b/src/fig/FIG0_1.h
index 4e8b5f5..4fc70ea 100644
--- a/src/fig/FIG0_1.h
+++ b/src/fig/FIG0_1.h
@@ -37,10 +37,10 @@ class FIG0_1 : public IFIG
public:
FIG0_1(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::A; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::A; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 1; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 1; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_10.h b/src/fig/FIG0_10.h
index 9210e0d..bc4a84b 100644
--- a/src/fig/FIG0_10.h
+++ b/src/fig/FIG0_10.h
@@ -38,10 +38,10 @@ class FIG0_10 : public IFIG
public:
FIG0_10(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 10; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 10; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_13.h b/src/fig/FIG0_13.h
index cd9ae9f..bac5b25 100644
--- a/src/fig/FIG0_13.h
+++ b/src/fig/FIG0_13.h
@@ -37,10 +37,10 @@ class FIG0_13 : public IFIG
public:
FIG0_13(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 13; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 13; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_17.h b/src/fig/FIG0_17.h
index 06d0743..d796f43 100644
--- a/src/fig/FIG0_17.h
+++ b/src/fig/FIG0_17.h
@@ -37,10 +37,10 @@ class FIG0_17 : public IFIG
public:
FIG0_17(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 17; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 17; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_18.h b/src/fig/FIG0_18.h
index da0e748..609af8c 100644
--- a/src/fig/FIG0_18.h
+++ b/src/fig/FIG0_18.h
@@ -36,10 +36,10 @@ class FIG0_18 : public IFIG
public:
FIG0_18(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 18; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 18; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_19.cpp b/src/fig/FIG0_19.cpp
index 0558464..f62e1a7 100644
--- a/src/fig/FIG0_19.cpp
+++ b/src/fig/FIG0_19.cpp
@@ -143,7 +143,7 @@ FillStatus FIG0_19::fill(uint8_t *buf, size_t max_size)
return fs;
}
-FIG_rate FIG0_19::repetition_rate(void)
+FIG_rate FIG0_19::repetition_rate() const
{
if ( m_transition.new_entries.size() > 0 or
m_transition.disabled_entries.size() ) {
diff --git a/src/fig/FIG0_19.h b/src/fig/FIG0_19.h
index 1d8f4a5..71668a4 100644
--- a/src/fig/FIG0_19.h
+++ b/src/fig/FIG0_19.h
@@ -37,10 +37,10 @@ class FIG0_19 : public IFIG
public:
FIG0_19(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void);
+ virtual FIG_rate repetition_rate() const;
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 19; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 19; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_2.h b/src/fig/FIG0_2.h
index 53865db..6cfca24 100644
--- a/src/fig/FIG0_2.h
+++ b/src/fig/FIG0_2.h
@@ -36,10 +36,10 @@ class FIG0_2 : public IFIG
public:
FIG0_2(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::A; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::A; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 2; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 2; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_21.h b/src/fig/FIG0_21.h
index 0aabf3b..706dead 100644
--- a/src/fig/FIG0_21.h
+++ b/src/fig/FIG0_21.h
@@ -38,10 +38,10 @@ class FIG0_21 : public IFIG
public:
FIG0_21(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::E; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::E; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 21; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 21; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_24.h b/src/fig/FIG0_24.h
index 785e9bc..d1e7604 100644
--- a/src/fig/FIG0_24.h
+++ b/src/fig/FIG0_24.h
@@ -38,10 +38,10 @@ class FIG0_24 : public IFIG
public:
FIG0_24(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::E; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::E; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 24; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 24; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_3.h b/src/fig/FIG0_3.h
index a3a936b..99f2936 100644
--- a/src/fig/FIG0_3.h
+++ b/src/fig/FIG0_3.h
@@ -38,10 +38,10 @@ class FIG0_3 : public IFIG
public:
FIG0_3(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::A; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::A; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 3; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 3; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_5.h b/src/fig/FIG0_5.h
index 1bfe8c3..381a3af 100644
--- a/src/fig/FIG0_5.h
+++ b/src/fig/FIG0_5.h
@@ -41,10 +41,10 @@ class FIG0_5 : public IFIG
public:
FIG0_5(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 5; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 5; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_6.h b/src/fig/FIG0_6.h
index 4fd7fd1..770c4d5 100644
--- a/src/fig/FIG0_6.h
+++ b/src/fig/FIG0_6.h
@@ -53,17 +53,17 @@ class FIG0_6 : public IFIG
public:
FIG0_6(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::E; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::E; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 6; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 6; }
private:
FIGRuntimeInformation *m_rti;
bool m_initialised;
/* Update the linkageSubsets */
- void update(void);
+ void update();
/* A LinkageSet can contain links of different types
* (DAB, FM, DRM, AMSS), but the FIG needs to send
diff --git a/src/fig/FIG0_8.h b/src/fig/FIG0_8.h
index dc150aa..64ca8d2 100644
--- a/src/fig/FIG0_8.h
+++ b/src/fig/FIG0_8.h
@@ -39,10 +39,10 @@ class FIG0_8 : public IFIG
public:
FIG0_8(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 8; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 8; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG0_9.h b/src/fig/FIG0_9.h
index d5714b8..0a71fa0 100644
--- a/src/fig/FIG0_9.h
+++ b/src/fig/FIG0_9.h
@@ -38,10 +38,10 @@ class FIG0_9 : public IFIG
public:
FIG0_9(FIGRuntimeInformation* rti);
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 0; }
- virtual const int figextension(void) const { return 9; }
+ virtual int figtype() const { return 0; }
+ virtual int figextension() const { return 9; }
private:
FIGRuntimeInformation *m_rti;
diff --git a/src/fig/FIG1.h b/src/fig/FIG1.h
index 2ae0bfb..2cca8d5 100644
--- a/src/fig/FIG1.h
+++ b/src/fig/FIG1.h
@@ -40,10 +40,10 @@ class FIG1_0 : public IFIG
FIG1_0(FIGRuntimeInformation* rti) :
m_rti(rti) {}
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 1; }
- virtual const int figextension(void) const { return 0; }
+ virtual int figtype() const { return 1; }
+ virtual int figextension() const { return 0; }
private:
FIGRuntimeInformation *m_rti;
@@ -56,10 +56,10 @@ class FIG1_1 : public IFIG
FIG1_1(FIGRuntimeInformation* rti) :
m_rti(rti), m_initialised(false) {}
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 1; }
- virtual const int figextension(void) const { return 1; }
+ virtual int figtype() const { return 1; }
+ virtual int figextension() const { return 1; }
private:
FIGRuntimeInformation *m_rti;
@@ -74,10 +74,10 @@ class FIG1_4 : public IFIG
FIG1_4(FIGRuntimeInformation* rti) :
m_rti(rti), m_initialised(false) {}
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 1; }
- virtual const int figextension(void) const { return 4; }
+ virtual int figtype() const { return 1; }
+ virtual int figextension() const { return 4; }
private:
FIGRuntimeInformation *m_rti;
@@ -92,10 +92,10 @@ class FIG1_5 : public IFIG
FIG1_5(FIGRuntimeInformation* rti) :
m_rti(rti), m_initialised(false) {}
virtual FillStatus fill(uint8_t *buf, size_t max_size);
- virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+ virtual FIG_rate repetition_rate() const { return FIG_rate::B; }
- virtual const int figtype(void) const { return 1; }
- virtual const int figextension(void) const { return 5; }
+ virtual int figtype() const { return 1; }
+ virtual int figextension() const { return 5; }
private:
FIGRuntimeInformation *m_rti;