Add FIG1/0

5 files changed, 131 insertions, 2 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 635c8c7..1cf8dbb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,6 +99,7 @@ odr_dabmux_SOURCES  =DabMux.cpp DabMux.h \
                      TcpSocket.h TcpSocket.cpp \
                      zmq.hpp \
                      fig/FIG0.cpp fig/FIG0.h \
+                     fig/FIG1.cpp fig/FIG1.h \
                      fig/FIGCarousel.cpp fig/FIGCarousel.h \
                      fig/FIG.h
 
diff --git a/src/fig/FIG.h b/src/fig/FIG.h
index 207b299..d2498d0 100644
--- a/src/fig/FIG.h
+++ b/src/fig/FIG.h
@@ -32,6 +32,8 @@
 
 namespace FIC {
 
+#define PACKED __attribute__ ((packed))
+
 class FIGRuntimeInformation {
     public:
         FIGRuntimeInformation(boost::shared_ptr<dabEnsemble> e) :
diff --git a/src/fig/FIG0.cpp b/src/fig/FIG0.cpp
index 2beaea0..eb571fc 100644
--- a/src/fig/FIG0.cpp
+++ b/src/fig/FIG0.cpp
@@ -30,8 +30,6 @@
 
 namespace FIC {
 
-#define PACKED __attribute__ ((packed))
-
 //=========== FIG 0/0 ===========
 
 FillStatus FIG0_0::fill(uint8_t *buf, size_t max_size)
diff --git a/src/fig/FIG1.cpp b/src/fig/FIG1.cpp
new file mode 100644
index 0000000..e596408
--- /dev/null
+++ b/src/fig/FIG1.cpp
@@ -0,0 +1,71 @@
+/*
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+   2011, 2012 Her Majesty the Queen in Right of Canada (Communications
+   Research Center Canada)
+
+   Copyright (C) 2015
+   Matthias P. Braendli, matthias.braendli@mpb.li
+
+   Implementation of FIG1
+   */
+/*
+   This file is part of ODR-DabMux.
+
+   ODR-DabMux is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as
+   published by the Free Software Foundation, either version 3 of the
+   License, or (at your option) any later version.
+
+   ODR-DabMux is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "fig/FIG1.h"
+#include "DabMultiplexer.h"
+
+namespace FIC {
+
+//=========== FIG 1/0 ===========
+
+FillStatus FIG1_0::fill(uint8_t *buf, size_t max_size)
+{
+    FillStatus fs;
+    auto ensemble = m_rti->ensemble;
+    size_t remaining = max_size;
+
+    if (remaining < 22) {
+        fs.num_bytes_written = 0;
+        return fs;
+    }
+
+    auto fig1_0 = (FIGtype1_0*)buf;
+
+    fig1_0->Length = 21;
+    fig1_0->FIGtypeNumber = 1;
+    fig1_0->Extension = 0;
+    fig1_0->OE = 0;
+    fig1_0->Charset = 0;
+    fig1_0->EId = htons(ensemble->id);
+    buf += 4;
+
+    ensemble->label.writeLabel(buf);
+    buf += 16;
+
+    buf[0] = ensemble->label.flag() >> 8;
+    buf[1] = ensemble->label.flag() & 0xFF;
+    buf += 2;
+
+    remaining -= 22;
+
+    fs.complete_fig_transmitted = true;
+    fs.num_bytes_written = max_size - remaining;
+    return fs;
+}
+
+} // namespace FIC
+
diff --git a/src/fig/FIG1.h b/src/fig/FIG1.h
new file mode 100644
index 0000000..e853152
--- /dev/null
+++ b/src/fig/FIG1.h
@@ -0,0 +1,57 @@
+/*
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+   2011, 2012 Her Majesty the Queen in Right of Canada (Communications
+   Research Center Canada)
+
+   Copyright (C) 2015
+   Matthias P. Braendli, matthias.braendli@mpb.li
+   */
+/*
+   This file is part of ODR-DabMux.
+
+   ODR-DabMux is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as
+   published by the Free Software Foundation, either version 3 of the
+   License, or (at your option) any later version.
+
+   ODR-DabMux is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __FIG1_H_
+#define __FIG1_H_
+
+#include <cstdint>
+
+#include "fig/FIG.h"
+
+namespace FIC {
+
+// FIG type 1/0, Multiplex Configuration Info (MCI),
+// Ensemble information
+class FIG1_0 : public IFIG
+{
+    public:
+        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 const int figtype(void) const { return 1; }
+        virtual const int figextension(void) const { return 0; }
+
+    private:
+        FIGRuntimeInformation *m_rti;
+};
+
+}
+
+
+#endif // __FIG1_H_
+
+