From abc06fbae9da4323c9f596e0e54070c04ae4ae15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96man?= <andreas@lonelycoder.com>
Date: Mon, 25 Aug 2008 16:57:14 +0000
Subject: [PATCH] Rename dvb_muxconfig.* into dvb_preconf.*

---
 Makefile                               | 2 +-
 dvb/dvb_adapter.c                      | 1 -
 dvb/dvb_multiplex.c                    | 1 -
 dvb/{dvb_muxconfig.c => dvb_preconf.c} | 2 +-
 dvb/{dvb_muxconfig.h => dvb_preconf.h} | 0
 dvb/dvb_tables.c                       | 1 -
 dvb/dvb_transport.c                    | 1 -
 webui/extjs.c                          | 2 +-
 8 files changed, 3 insertions(+), 7 deletions(-)
 rename dvb/{dvb_muxconfig.c => dvb_preconf.c} (99%)
 rename dvb/{dvb_muxconfig.h => dvb_preconf.h} (100%)

diff --git a/Makefile b/Makefile
index 3fd1ac3c..c4e7b9df 100644
--- 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 d8bfef18..a1185ea8 100644
--- 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 fcaa3edf..a652f84a 100644
--- 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 50f4bef0..9a63b0b0 100644
--- 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 5d182dd3..4b3e9440 100644
--- 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 61cf9d75..0b8da781 100644
--- 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 8d2c2752..b1484169 100644
--- 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;