aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Pöschel <github@basicmaster.de>2017-08-22 20:44:25 +0200
committerStefan Pöschel <github@basicmaster.de>2017-08-22 20:44:25 +0200
commit46464f05c951b033b4c4d6449aef3c05c67d0b38 (patch)
tree64191e1e63c05d328e6c5b05bf5d7fb97195fdd3
parentdab43a8fb43c904cc316f327d8117beb102e04de (diff)
downloadODR-PadEnc-46464f05c951b033b4c4d6449aef3c05c67d0b38.tar.gz
ODR-PadEnc-46464f05c951b033b4c4d6449aef3c05c67d0b38.tar.bz2
ODR-PadEnc-46464f05c951b033b4c4d6449aef3c05c67d0b38.zip
Move includes/static vars into new main header
-rw-r--r--Makefile.am1
-rw-r--r--src/odr-padenc.cpp22
-rw-r--r--src/odr-padenc.h49
3 files changed, 51 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index 6123343..21c474c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ odr_padenc_CXXFLAGS = $(GITVERSION_FLAGS) @MAGICKWAND_CFLAGS@ -Icontrib -Wall -W
odr_padenc_LDADD = @MAGICKWAND_LDADD@
odr_padenc_SOURCES = \
src/odr-padenc.cpp \
+ src/odr-padenc.h \
src/common.cpp \
src/common.h \
src/pad_common.cpp \
diff --git a/src/odr-padenc.cpp b/src/odr-padenc.cpp
index 6536999..1edec27 100644
--- a/src/odr-padenc.cpp
+++ b/src/odr-padenc.cpp
@@ -27,26 +27,7 @@
\author Stefan Pöschel <odr@basicmaster.de>
*/
-#include "common.h"
-
-#include <stdlib.h>
-#include <signal.h>
-#include <string>
-#include <thread>
-#include <vector>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <getopt.h>
-
-#include "pad_common.h"
-#include "dls.h"
-#include "sls.h"
-
-
-static const int SLEEPDELAY_DEFAULT = 10; // seconds
-static const int DLS_REPETITION_WHILE_SLS = 50;
-
-static bool do_exit = false;
+#include "odr-padenc.h"
static void break_handler(int) {
@@ -54,7 +35,6 @@ static void break_handler(int) {
do_exit = true;
}
-
static void header() {
fprintf(stderr, "ODR-PadEnc %s - DAB PAD encoder for MOT Slideshow and DLS\n\n"
"By CSP Innovazione nelle ICT s.c.a r.l. (http://rd.csp.it/) and\n"
diff --git a/src/odr-padenc.h b/src/odr-padenc.h
new file mode 100644
index 0000000..2b3f79b
--- /dev/null
+++ b/src/odr-padenc.h
@@ -0,0 +1,49 @@
+/*
+ Copyright (C) 2014 CSP Innovazione nelle ICT s.c.a r.l. (http://rd.csp.it/)
+
+ Copyright (C) 2014, 2015 Matthias P. Braendli (http://opendigitalradio.org)
+
+ Copyright (C) 2015, 2016, 2017 Stefan Pöschel (http://opendigitalradio.org)
+
+ This program 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.
+
+ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+/*!
+ \file odr-padenc.h
+ \brief Generate PAD data for MOT Slideshow and DLS
+
+ \author Sergio Sagliocco <sergio.sagliocco@csp.it>
+ \author Matthias P. Braendli <matthias@mpb.li>
+ \author Stefan Pöschel <odr@basicmaster.de>
+*/
+
+#include "common.h"
+
+#include <stdlib.h>
+#include <signal.h>
+#include <string>
+#include <thread>
+#include <vector>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <getopt.h>
+
+#include "pad_common.h"
+#include "dls.h"
+#include "sls.h"
+
+
+static const int SLEEPDELAY_DEFAULT = 10; // seconds
+static const int DLS_REPETITION_WHILE_SLS = 50;
+
+static bool do_exit = false;