Move filepush from lib/base to lib/dvb
authorMike Looijmans <milo@openpli.org>
Mon, 28 Dec 2015 10:27:47 +0000 (11:27 +0100)
committerMike Looijmans <milo@openpli.org>
Mon, 28 Dec 2015 10:36:32 +0000 (11:36 +0100)
The filepush sources do not belong in "base", they are exclusively referred in
the DVB subsystem, so move them there.

lib/base/Makefile.inc
lib/dvb/Makefile.inc
lib/dvb/demux.h
lib/dvb/dvb.cpp
lib/dvb/dvb.h
lib/dvb/filepush.cpp [moved from lib/base/filepush.cpp with 99% similarity]
lib/dvb/filepush.h [moved from lib/base/filepush.h with 100% similarity]

index f6385a0..6930c17 100644 (file)
@@ -13,7 +13,6 @@ base_libenigma_base_a_SOURCES = \
        base/encoding.cpp \
        base/estring.cpp \
        base/freesatv2.cpp \
-       base/filepush.cpp \
        base/init.cpp \
        base/ioprio.cpp \
        base/message.cpp \
@@ -40,7 +39,6 @@ baseinclude_HEADERS = \
        base/encoding.h \
        base/eptrlist.h \
        base/estring.h \
-       base/filepush.h \
        base/freesatv2.cpp \
        base/i18n.h \
        base/itssource.h \
index 5b1d91e..e4086b4 100644 (file)
@@ -13,6 +13,7 @@ dvb_libenigma_dvb_a_SOURCES = \
        dvb/epgcache.cpp \
        dvb/esection.cpp \
        dvb/fastscan.cpp \
+       dvb/filepush.cpp \
        dvb/frontend.cpp \
        dvb/frontendparms.cpp \
        dvb/metaparser.cpp \
@@ -45,6 +46,7 @@ dvbinclude_HEADERS = \
        dvb/epgcache.h \
        dvb/esection.h \
        dvb/fastscan.h \
+       dvb/filepush.h \
        dvb/frontend.h \
        dvb/frontendparms.h \
        dvb/idemux.h \
index 9c7bacb..285bb83 100644 (file)
@@ -4,8 +4,8 @@
 #include <aio.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/idemux.h>
-#include <lib/base/filepush.h>
 #include <lib/dvb/pvrparse.h>
+#include "filepush.h"
 
 class eDVBDemux: public iDVBDemux
 {
index 4cb29f5..bac842b 100644 (file)
@@ -3,13 +3,13 @@
 #include <linux/dvb/version.h>
 
 #include <lib/base/eerror.h>
-#include <lib/base/filepush.h>
 #include <lib/base/wrappers.h>
 #include <lib/dvb/cahandler.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/specs.h>
+#include "filepush.h"
 
 #include <errno.h>
 #include <sys/types.h>
index 0c81455..0b76b92 100644 (file)
@@ -4,13 +4,13 @@
 #ifndef SWIG
 
 #include <lib/base/ebase.h>
-#include <lib/base/filepush.h>
 #include <lib/base/elock.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/tstools.h>
 #include <lib/dvb/esection.h>
+#include "filepush.h"
 #include <connection.h>
 
 #include <dvbsi++/service_description_section.h>
similarity index 99%
rename from lib/base/filepush.cpp
rename to lib/dvb/filepush.cpp
index 89fec89..ad6fccc 100644 (file)
@@ -1,4 +1,4 @@
-#include <lib/base/filepush.h>
+#include "filepush.h"
 #include <lib/base/eerror.h>
 #include <errno.h>
 #include <fcntl.h>
similarity index 100%
rename from lib/base/filepush.h
rename to lib/dvb/filepush.h