summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-08-07 10:08:11 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-08-07 10:08:11 +0200
commit0bb9b364693659a184862771f98a4b6046587073 (patch)
tree6db0cbbc94818634e8c137bf594b9a8937f770de
parent8f347e6eeb809cd51a561768619e0a64c86a469e (diff)
downloaddabmux-0bb9b364693659a184862771f98a4b6046587073.tar.gz
dabmux-0bb9b364693659a184862771f98a4b6046587073.tar.bz2
dabmux-0bb9b364693659a184862771f98a4b6046587073.zip
Create namespace for FIC stuff
-rw-r--r--src/DabMultiplexer.h2
-rw-r--r--src/fig/FIG.h4
-rw-r--r--src/fig/FIG0.cpp4
-rw-r--r--src/fig/FIG0.h4
-rw-r--r--src/fig/FIGCarousel.cpp4
-rw-r--r--src/fig/FIGCarousel.h4
6 files changed, 21 insertions, 1 deletions
diff --git a/src/DabMultiplexer.h b/src/DabMultiplexer.h
index de05b6c..30a04bc 100644
--- a/src/DabMultiplexer.h
+++ b/src/DabMultiplexer.h
@@ -139,7 +139,7 @@ class DabMultiplexer {
#endif // HAVE_OUTPUT_EDI
/* New FIG Carousel */
- FIGCarousel fig_carousel;
+ FIC::FIGCarousel fig_carousel;
};
// DAB Mode
diff --git a/src/fig/FIG.h b/src/fig/FIG.h
index 7f6e499..6bcb42b 100644
--- a/src/fig/FIG.h
+++ b/src/fig/FIG.h
@@ -30,6 +30,8 @@
#include <boost/shared_ptr.hpp>
#include "MuxElements.h"
+namespace FIC {
+
class FIGRuntimeInformation {
public:
FIGRuntimeInformation(boost::shared_ptr<dabEnsemble> e) :
@@ -105,5 +107,7 @@ class IFIG
};
+} // namespace FIC
+
#endif // __FIG_H_
diff --git a/src/fig/FIG0.cpp b/src/fig/FIG0.cpp
index f738a46..36e993a 100644
--- a/src/fig/FIG0.cpp
+++ b/src/fig/FIG0.cpp
@@ -28,6 +28,8 @@
#include "fig/FIG0.h"
#include "DabMultiplexer.h"
+namespace FIC {
+
#define PACKED __attribute__ ((packed))
//=========== FIG 0/0 ===========
@@ -499,3 +501,5 @@ FillStatus FIG0_17::fill(uint8_t *buf, size_t max_size)
return fs;
}
+} // namespace FIC
+
diff --git a/src/fig/FIG0.h b/src/fig/FIG0.h
index d253555..1ba59df 100644
--- a/src/fig/FIG0.h
+++ b/src/fig/FIG0.h
@@ -30,6 +30,8 @@
#include "fig/FIG.h"
+namespace FIC {
+
// FIG type 0/0, Multiplex Configuration Info (MCI),
// Ensemble information
class FIG0_0 : public IFIG
@@ -117,5 +119,7 @@ class FIG0_17 : public IFIG
std::vector<std::shared_ptr<DabService> >::iterator serviceFIG0_17;
};
+} // namespace FIC
+
#endif // __FIG0_H_
diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp
index e3c49d6..8986a18 100644
--- a/src/fig/FIGCarousel.cpp
+++ b/src/fig/FIGCarousel.cpp
@@ -31,6 +31,8 @@
#include <iostream>
#include <deque>
+namespace FIC {
+
/**************** FIGCarouselElement ****************/
void FIGCarouselElement::reduce_deadline()
{
@@ -211,3 +213,5 @@ size_t FIGCarousel::carousel(
return bufsize - available_size;
}
+} // namespace FIC
+
diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h
index 4e91009..acf53c1 100644
--- a/src/fig/FIGCarousel.h
+++ b/src/fig/FIGCarousel.h
@@ -36,6 +36,8 @@
#include <boost/shared_ptr.hpp>
#include "MuxElements.h"
+namespace FIC {
+
struct FIGCarouselElement {
IFIG* fig;
int deadline; // unit: ms
@@ -71,5 +73,7 @@ class FIGCarousel {
FIG0_17 m_fig0_17;
};
+} // namespace FIC
+
#endif // __FIG_CAROUSEL_H_