Move DVB subsystem to a directory of its own.

Makefile

@@ -13,6 +13,7 @@ SRCS += pvr.c autorec.c ffmuxer.c
 
 SRCS += epg.c epg_xmltv.c
 
+VPATH += dvb
 SRCS += dvb.c dvb_support.c dvb_dvr.c dvb_muxconfig.c dvb_fe.c dvb_tables.c \
 	diseqc.c
 
@@ -41,7 +42,7 @@ JSSRCS += tvheadend.js extensions.js acleditor.js cwceditor.js \
 
 CSSSRCS += ext.css
 
-PROGPATH = $(HTS_BUILD_ROOT)/tvheadend_newui
+PROGPATH = $(HTS_BUILD_ROOT)/tvheadend
 PROG = tvheadend
 MAN  = tvheadend.1
 CFLAGS += -g -Wall -Werror -O2 -mmmx

channels.c

@@ -32,7 +32,6 @@
 #include <libhts/htscfg.h>
 
 #include "tvhead.h"
-#include "dvb.h"
 #include "v4l.h"
 #include "iptv_input.h"
 #include "psi.h"

htsclient.c

@@ -36,7 +36,6 @@
 #include "epg.h"
 #include "teletext.h"
 #include "dispatch.h"
-#include "dvb.h"
 #include "buffer.h"
 #include "tsmux.h"
 #include "tcp.h"

main.c

@@ -37,7 +37,7 @@
 #include <libavformat/avformat.h>
 
 #include "tvhead.h"
-#include "dvb.h"
+#include "dvb/dvb.h"
 #include "v4l.h"
 #include "channels.h"
 #include "htsclient.h"

psi.c

@@ -28,7 +28,7 @@
 #include "tvhead.h"
 #include "psi.h"
 #include "transports.h"
-#include "dvb_support.h"
+#include "dvb/dvb_support.h"
 #include "tsdemux.h"
 #include "parsers.h"
 

rtsp.c

@@ -35,7 +35,6 @@
 #include "epg.h"
 #include "teletext.h"
 #include "dispatch.h"
-#include "dvb.h"
 #include "rtp.h"
 #include "tsmux.h"
 #include "tcp.h"

subscriptions.c

@@ -38,13 +38,11 @@
 
 #include "tvhead.h"
 #include "dispatch.h"
-#include "dvb_dvr.h"
 #include "teletext.h"
 #include "transports.h"
 #include "subscriptions.h"
 
 #include "v4l.h"
-#include "dvb_dvr.h"
 #include "iptv_input.h"
 #include "psi.h"
 

transports.c

@@ -38,15 +38,12 @@
 
 #include "tvhead.h"
 #include "dispatch.h"
-#include "dvb_dvr.h"
-#include "dvb_support.h"
 #include "teletext.h"
 #include "transports.h"
 #include "subscriptions.h"
 #include "tsdemux.h"
 
 #include "v4l.h"
-#include "dvb_dvr.h"
 #include "iptv_input.h"
 #include "psi.h"
 #include "buffer.h"

webui/extjs.c

@@ -33,9 +33,9 @@
 #include "access.h"
 #include "dtable.h"
 
-#include "dvb.h"
-#include "dvb_support.h"
-#include "dvb_muxconfig.h"
+#include "dvb/dvb.h"
+#include "dvb/dvb_support.h"
+#include "dvb/dvb_muxconfig.h"
 #include "transports.h"
 
 extern const char *htsversion;