diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/charset.h | 2 | ||||
| -rw-r--r-- | src/common.h | 36 | ||||
| -rw-r--r-- | src/crc.h | 2 | ||||
| -rw-r--r-- | src/odr-padenc.cpp | 8 |
5 files changed, 43 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 88f4e3e..cdbb542 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/common.h \ src/charset.h \ src/crc.cpp \ src/crc.h diff --git a/src/charset.h b/src/charset.h index 8d1e1a2..a31ca25 100644 --- a/src/charset.h +++ b/src/charset.h @@ -25,6 +25,8 @@ #ifndef __CHARSET_H_ #define __CHARSET_H_ +#include "common.h" + #include "utf8.h" #include <string> #include <vector> diff --git a/src/common.h b/src/common.h new file mode 100644 index 0000000..ca7e728 --- /dev/null +++ b/src/common.h @@ -0,0 +1,36 @@ +/* + Copyright (C) 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 common.h + \brief Includes common settings/includes/etc. + + \author Stefan Pöschel <odr@basicmaster.de> +*/ + +#ifndef COMMON_H_ +#define COMMON_H_ + +// include settings by configure +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +//#define DEBUG + +extern int verbose; + +#endif /* COMMON_H_ */ @@ -18,6 +18,8 @@ #pragma once +#include "common.h" + #include <stdint.h> namespace odr{ diff --git a/src/odr-padenc.cpp b/src/odr-padenc.cpp index 2708a05..1ae5a73 100644 --- a/src/odr-padenc.cpp +++ b/src/odr-padenc.cpp @@ -27,9 +27,7 @@ \author Stefan Pöschel <odr@basicmaster.de> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "common.h" #include <cstdio> #include <stdlib.h> @@ -59,7 +57,6 @@ -//#define DEBUG #define SLEEPDELAY_DEFAULT 10 // seconds #define XSTR(x) #x @@ -84,8 +81,7 @@ enum { }; typedef std::vector<uint8_t> uint8_vector_t; -static int verbose = 0; - +int verbose = 0; struct MSCDG { // MSC Data Group Header (extension field not supported) |