Factor out init.hpp.

diff --git a/Makefile.am b/Makefile.am
index 5ebd114a66c44edc265a811d7d9bbab3eb2ad268..4ee00a2b4b3bc2f592334aa26dbbe1359269152c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,8 @@ libsigrokflow_la_LDFLAGS = -version-info $(SRF_LIB_VERSION) -no-undefined
 
 library_includedir = $(includedir)/libsigrokflow
 library_include_HEADERS = \
-       include/libsigrokflow/libsigrokflow.hpp
+       include/libsigrokflow/libsigrokflow.hpp \
+       include/libsigrokflow/init.hpp
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokflow.pc

diff --git a/include/libsigrokflow/init.hpp b/include/libsigrokflow/init.hpp
new file mode 100644 (file)
index 0000000..f4f3987
--- /dev/null
+++ b/include/libsigrokflow/init.hpp
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the libsigrokflow project.
+ *
+ * Copyright (C) 2018 Martin Ling <martin-sigrok@earth.li>
+ * Copyright (C) 2018 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * 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/>.
+ */
+
+#ifndef LIBSIGROKFLOW_INIT_HPP
+#define LIBSIGROKFLOW_INIT_HPP
+
+namespace Srf
+{
+
+void init();
+
+void deinit();
+
+}
+#endif

diff --git a/include/libsigrokflow/libsigrokflow.hpp b/include/libsigrokflow/libsigrokflow.hpp
index 56e248d7a61aa0a3497b2595bfceb96a2385997d..98397b58860523723b440d2588508e284fe04896 100644 (file)
--- a/include/libsigrokflow/libsigrokflow.hpp
+++ b/include/libsigrokflow/libsigrokflow.hpp
@@ -35,15 +35,13 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+#include <libsigrokflow/init.hpp>
+
 namespace Srf
 {
 
 using namespace std;
 
-void init();
-
-void deinit();
-
 class Block
 {
        /* Config API etc. goes here. */

diff --git a/src/init.cpp b/src/init.cpp
index e306ff262a3358fc2a86f48d1af5b9e6ebf73745..e299592a557b644317b54790ce5458a878e28e04 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -19,10 +19,16 @@
  */
 
 #include <config.h>
-#include <libsigrokflow/libsigrokflow.hpp>
+#include <gstreamermm.h>
+#include <libsigrokflow/init.hpp>
+#include <libsigrokflow/legacy_capture_device.hpp>
+#include <libsigrokflow/legacy_input.hpp>
+#include <libsigrokflow/legacy_output.hpp>
+#include <libsigrokflow/legacy_decoder.hpp>
 
 namespace Srf
 {
+using namespace std;
 
 static bool srf_initialized_ = false;