Rename dvb_muxconfig.* into dvb_preconf.*

diff --git a/Makefile b/Makefile
index 3fd1ac3cca404a752a4caba1fb87b66195100587..c4e7b9dffb610a66284c8768e0e6da6211342fb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,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 \
+SRCS += dvb.c dvb_support.c dvb_dvr.c dvb_preconf.c dvb_fe.c dvb_tables.c \
        diseqc.c dvb_adapter.c dvb_multiplex.c dvb_transport.c
 
 SRCS += iptv_input.c iptv_output.c

diff --git a/dvb/dvb_adapter.c b/dvb/dvb_adapter.c
index d8bfef18e686e30e40f3399a28dc626842aec818..a1185ea800929a5483435af4126e48a3861e9aaa 100644 (file)
--- a/dvb/dvb_adapter.c
+++ b/dvb/dvb_adapter.c
@@ -47,7 +47,6 @@
 #include "psi.h"
 #include "dvb_support.h"
 #include "dvb_dvr.h"
-#include "dvb_muxconfig.h"
 #include "notify.h"
 
 struct th_dvb_adapter_queue dvb_adapters;

diff --git a/dvb/dvb_multiplex.c b/dvb/dvb_multiplex.c
index fcaa3edfe293ce246a2f4fa7292a4c4e85d2dab7..a652f84aa6759fd19cb26a4d69e955c92d6897d5 100644 (file)
--- a/dvb/dvb_multiplex.c
+++ b/dvb/dvb_multiplex.c
@@ -47,7 +47,6 @@
 #include "psi.h"
 #include "dvb_support.h"
 #include "dvb_dvr.h"
-#include "dvb_muxconfig.h"
 #include "notify.h"
 
 struct th_dvb_mux_instance_tree dvb_muxes;

diff --git a/dvb/dvb_muxconfig.c b/dvb/dvb_preconf.c
similarity index 99%
rename from dvb/dvb_muxconfig.c
rename to dvb/dvb_preconf.c
index 50f4bef02b41d5a126f413a7c8ed65989bbc19d6..9a63b0b0af04e75880ca37df3a7281e59d8e579e 100644 (file)
--- a/dvb/dvb_muxconfig.c
+++ b/dvb/dvb_preconf.c
@@ -28,7 +28,7 @@
 
 #include "tvhead.h"
 #include "dvb.h"
-#include "dvb_muxconfig.h"
+#include "dvb_preconf.h"
 
 /**
  * A big list of all known DVB networks (from linuxtv.org)

diff --git a/dvb/dvb_muxconfig.h b/dvb/dvb_preconf.h
similarity index 100%
rename from dvb/dvb_muxconfig.h
rename to dvb/dvb_preconf.h

diff --git a/dvb/dvb_tables.c b/dvb/dvb_tables.c
index 5d182dd3779681cd14fa6b79ff81367d4694aa3d..4b3e9440c23899f622e506e87fee7f022bce14d5 100644 (file)
--- a/dvb/dvb_tables.c
+++ b/dvb/dvb_tables.c
@@ -36,7 +36,6 @@
 #include "tvhead.h"
 #include "dispatch.h"
 #include "dvb.h"
-#include "dvb_muxconfig.h"
 #include "dvb_support.h"
 #include "epg.h"
 #include "transports.h"

diff --git a/dvb/dvb_transport.c b/dvb/dvb_transport.c
index 61cf9d75909e1ef6d6a18681d55bfcb22df7468a..0b8da781939159439bc51e974b5401e047210955 100644 (file)
--- a/dvb/dvb_transport.c
+++ b/dvb/dvb_transport.c
@@ -45,7 +45,6 @@
 #include "psi.h"
 #include "dvb_support.h"
 #include "dvb_dvr.h"
-#include "dvb_muxconfig.h"
 #include "notify.h"
 
 

diff --git a/webui/extjs.c b/webui/extjs.c
index 8d2c2752634e4c7754c9bfbfb8b7c65c31aa52e5..b14841698dbe47d617c9a4c72c36ab882dfa2a22 100644 (file)
--- a/webui/extjs.c
+++ b/webui/extjs.c
@@ -35,7 +35,7 @@
 
 #include "dvb/dvb.h"
 #include "dvb/dvb_support.h"
-#include "dvb/dvb_muxconfig.h"
+#include "dvb/dvb_preconf.h"
 #include "transports.h"
 
 extern const char *htsversion;