From b18c8ea7c49f0e33f6fa5bd8ea467562cce260f1 Mon Sep 17 00:00:00 2001
From: Stefan Pöschel <github@basicmaster.de>
Date: Sat, 11 Feb 2017 00:41:50 +0100
Subject: Move common code parts

---
 Makefile.am        |  1 +
 src/common.cpp     | 36 ++++++++++++++++++++++++++++++++++++
 src/common.h       | 10 +++++++++-
 src/odr-padenc.cpp | 12 ------------
 4 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 src/common.cpp

diff --git a/Makefile.am b/Makefile.am
index ef92e64..fac92c2 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.cpp \
 					  src/common.h \
 					  src/pad_common.cpp \
 					  src/pad_common.h \
diff --git a/src/common.cpp b/src/common.cpp
new file mode 100644
index 0000000..f7f23d7
--- /dev/null
+++ b/src/common.cpp
@@ -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.cpp
+    \brief Includes common settings/includes/etc.
+
+    \author Stefan Pöschel <odr@basicmaster.de>
+*/
+
+#include "common.h"
+
+int verbose = 0;
+
+std::vector<std::string> split_string(const std::string &s, const char delimiter) {
+    std::vector<std::string> result;
+    std::stringstream ss(s);
+    std::string part;
+
+    while (std::getline(ss, part, delimiter))
+        result.push_back(part);
+    return result;
+}
diff --git a/src/common.h b/src/common.h
index ca7e728..2c83dc6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -24,13 +24,21 @@
 #ifndef COMMON_H_
 #define COMMON_H_
 
+// enable for debug output
+//#define DEBUG
+
 // include settings by configure
 #ifdef HAVE_CONFIG_H
 #   include "config.h"
 #endif
 
-//#define DEBUG
+
+#include <string>
+#include <vector>
+#include <sstream>
+
 
 extern int verbose;
+extern std::vector<std::string> split_string(const std::string &s, const char delimiter);
 
 #endif /* COMMON_H_ */
diff --git a/src/odr-padenc.cpp b/src/odr-padenc.cpp
index 26d3b08..ccc18f1 100644
--- a/src/odr-padenc.cpp
+++ b/src/odr-padenc.cpp
@@ -74,8 +74,6 @@ enum {
     CHARSET_UTF8                    = 15  //!< ISO Latin Alphabet No 2
 };
 
-int verbose = 0;
-
 struct MSCDG {
     // MSC Data Group Header (extension field not supported)
     unsigned char extflag;      //  1 bit
@@ -412,16 +410,6 @@ struct DL_STATE {
 static bool dls_toggle = false;
 static DL_STATE dl_state_prev;
 
-std::vector<std::string> split_string(const std::string &s, const char delimiter) {
-    std::vector<std::string> result;
-    std::stringstream ss(s);
-    std::string part;
-
-    while (std::getline(ss, part, delimiter))
-        result.push_back(part);
-    return result;
-}
-
 
 
 
-- 
cgit v1.2.3