diff --git a/lib/Makefile b/lib/Makefile index 46a4ee9..8ed2eb7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -6,7 +6,6 @@ install: all cp -d src/libdddvb.so* /usr/local/lib cp -d src/libdddvb.h /usr/local/include/ cp -d src/dddvb.h /usr/local/include/ - cp -d src/dvb_filter.h /usr/local/include/ cp -d ddzap /usr/local/bin ldconfig diff --git a/lib/ddzap.c b/lib/ddzap.c index 8f6d7f2..eb2112a 100644 --- a/lib/ddzap.c +++ b/lib/ddzap.c @@ -1,6 +1,7 @@ #define _LARGEFILE64_SOURCE #include "../include/linux/dvb/frontend.h" #include "src/libdddvb.h" +#include "src/dvb_filter.h" #include #include #include diff --git a/lib/src/ca.c b/lib/src/ca.c index 4bafdaa..54a06f4 100644 --- a/lib/src/ca.c +++ b/lib/src/ca.c @@ -2,6 +2,7 @@ #include "dddvb.h" #include "tools.h" #include "debug.h" +#include "dvb_filter.h" #include #include diff --git a/lib/src/dddvb.h b/lib/src/dddvb.h index 8d3a352..ab3106b 100644 --- a/lib/src/dddvb.h +++ b/lib/src/dddvb.h @@ -96,7 +96,16 @@ struct dddvb_fe { struct dddvb_status status; }; -#include "dvb_filter.h" +struct dvbf_pid { + uint16_t pid; + uint8_t cc; + uint16_t bufp; + uint16_t len; + uint8_t buf[4096]; + + int (*cb) (struct dvbf_pid *); + void *cbd; +}; struct dddvb_ca { struct dddvb *dd; diff --git a/lib/src/dvb_filter.h b/lib/src/dvb_filter.h index 7428538..319de33 100644 --- a/lib/src/dvb_filter.h +++ b/lib/src/dvb_filter.h @@ -27,18 +27,6 @@ static inline int tspaystart(const uint8_t *tsp) } - -struct dvbf_pid { - uint16_t pid; - uint8_t cc; - uint16_t bufp; - uint16_t len; - uint8_t buf[4096]; - - int (*cb) (struct dvbf_pid *); - void *cbd; -}; - static inline void pidf_reset(struct dvbf_pid *pidf) { pidf->bufp = pidf->len = 0;