aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-12-08 08:16:20 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-12-08 08:16:20 +0100
commitd573723196f4f0c97e64d5a3a7adbabd3d51a429 (patch)
treedc911a5504ef58590d9e3f13a2175d7c1610016f
parentab8c080ef5cac511616ad98219a3e788fbddfb2a (diff)
downloaddabmux-d573723196f4f0c97e64d5a3a7adbabd3d51a429.tar.gz
dabmux-d573723196f4f0c97e64d5a3a7adbabd3d51a429.tar.bz2
dabmux-d573723196f4f0c97e64d5a3a7adbabd3d51a429.zip
Rename prbs to PrbsGenerator
Some systems apparently don't like having both prbs.h and Prbs.h in the include paths. OSX seems to be affected
-rw-r--r--src/Makefile.am2
-rw-r--r--src/PrbsGenerator.cpp (renamed from src/prbs.cpp)2
-rw-r--r--src/PrbsGenerator.h (renamed from src/prbs.h)0
-rw-r--r--src/input/Prbs.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index badc0b9..653da76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,7 +103,7 @@ odr_dabmux_SOURCES =DabMux.cpp DabMux.h \
fig/FIGCarousel.cpp fig/FIGCarousel.h \
fig/TransitionHandler.h \
mpeg.h mpeg.c \
- prbs.h prbs.cpp \
+ PrbsGenerator.cpp PrbsGenerator.h \
utils.cpp utils.h \
zmq.hpp \
fec/char.h fec/rs-common.h \
diff --git a/src/prbs.cpp b/src/PrbsGenerator.cpp
index b0e3d6d..1f8437c 100644
--- a/src/prbs.cpp
+++ b/src/PrbsGenerator.cpp
@@ -19,7 +19,7 @@
along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "prbs.h"
+#include "PrbsGenerator.h"
#include <string.h>
#include <limits.h>
diff --git a/src/prbs.h b/src/PrbsGenerator.h
index 0c29965..0c29965 100644
--- a/src/prbs.h
+++ b/src/PrbsGenerator.h
diff --git a/src/input/Prbs.h b/src/input/Prbs.h
index 3b2b7d4..51b7756 100644
--- a/src/input/Prbs.h
+++ b/src/input/Prbs.h
@@ -31,7 +31,7 @@
#include <string>
#include "input/inputs.h"
-#include "prbs.h"
+#include "PrbsGenerator.h"
namespace Inputs {