From f8657f7a2b723f9dcc94879abd1f3a2c2e2ac32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Thu, 16 Aug 2007 11:19:18 +0000 Subject: [PATCH] Rename files to better names --- Makefile | 6 +++--- channels.c | 6 +++--- input_dvb.c => dvb.c | 3 +-- input_dvb.h => dvb.h | 6 +++--- dvb_dvr.c | 2 +- epg_xmltv.c | 1 - output_client.c => htsclient.c | 0 output_client.h => htsclient.h | 6 +++--- input_iptv.c => iptv_input.c | 2 +- input_iptv.h => iptv_input.h | 6 +++--- output_multicast.c => iptv_output.c | 2 +- output_multicast.h => iptv_output.h | 6 +++--- main.c | 8 ++++---- pvr.c | 2 +- pvr_rec.c | 1 - transports.c | 5 +++-- input_v4l.c => v4l.c | 0 input_v4l.h => v4l.h | 6 +++--- 18 files changed, 33 insertions(+), 35 deletions(-) rename input_dvb.c => dvb.c (99%) rename input_dvb.h => dvb.h (94%) rename output_client.c => htsclient.c (100%) rename output_client.h => htsclient.h (91%) rename input_iptv.c => iptv_input.c (99%) rename input_iptv.h => iptv_input.h (92%) rename output_multicast.c => iptv_output.c (99%) rename output_multicast.h => iptv_output.h (90%) rename input_v4l.c => v4l.c (100%) rename input_v4l.h => v4l.h (93%) diff --git a/Makefile b/Makefile index f3f86149..07473355 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,11 @@ SRCS += pvr.c pvr_rec.c SRCS += epg.c epg_xmltv.c -SRCS += dvb_support.c dvb_pmt.c dvb_dvr.c +SRCS += dvb.c dvb_support.c dvb_pmt.c dvb_dvr.c -SRCS += input_dvb.c input_iptv.c #input_v4l.c +SRCS += iptv_input.c iptv_output.c -SRCS += output_client.c output_multicast.c +SRCS += htsclient.c PROG = tvhead CFLAGS += -g -Wall -Werror -O2 diff --git a/channels.c b/channels.c index 1db448ef..6e36f2f6 100644 --- a/channels.c +++ b/channels.c @@ -31,9 +31,9 @@ #include #include "tvhead.h" -#include "input_dvb.h" -#include "input_v4l.h" -#include "input_iptv.h" +#include "dvb.h" +#include "v4l.h" +#include "iptv_input.h" #include "dvb_pmt.h" #include "channels.h" diff --git a/input_dvb.c b/dvb.c similarity index 99% rename from input_dvb.c rename to dvb.c index 64458ec2..04b99705 100644 --- a/input_dvb.c +++ b/dvb.c @@ -36,8 +36,7 @@ #include "tvhead.h" #include "dispatch.h" -#include "input_dvb.h" -#include "output_client.h" +#include "dvb.h" #include "channels.h" #include "transports.h" #include "teletext.h" diff --git a/input_dvb.h b/dvb.h similarity index 94% rename from input_dvb.h rename to dvb.h index f5fdc470..616e2b9b 100644 --- a/input_dvb.h +++ b/dvb.h @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef INPUT_DVB_H -#define INPUT_DVB_H +#ifndef DVB_H_ +#define DVB_H_ extern struct th_dvb_adapter_list dvb_adapters_probing; extern struct th_dvb_adapter_list dvb_adapters_running; @@ -29,4 +29,4 @@ int dvb_configure_transport(th_transport_t *t, const char *muxname); int dvb_tune(th_dvb_adapter_t *tda, th_dvb_mux_t *tdm, int maylog); -#endif /* INPUT_DVB_H */ +#endif /* DVB_H_ */ diff --git a/dvb_dvr.c b/dvb_dvr.c index 78b5988e..e4e34bcd 100644 --- a/dvb_dvr.c +++ b/dvb_dvr.c @@ -36,7 +36,7 @@ #include "tvhead.h" #include "dispatch.h" -#include "input_dvb.h" +#include "dvb.h" #include "dvb_dvr.h" #include "channels.h" #include "transports.h" diff --git a/epg_xmltv.c b/epg_xmltv.c index 489c004d..765c83a2 100644 --- a/epg_xmltv.c +++ b/epg_xmltv.c @@ -35,7 +35,6 @@ #include "channels.h" #include "epg.h" #include "epg_xmltv.h" -#include "output_client.h" extern int xmltvreload; diff --git a/output_client.c b/htsclient.c similarity index 100% rename from output_client.c rename to htsclient.c diff --git a/output_client.h b/htsclient.h similarity index 91% rename from output_client.h rename to htsclient.h index 2da4f8e6..0d1d65d5 100644 --- a/output_client.h +++ b/htsclient.h @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef OUTPUT_CLIENT_H -#define OUTPUT_CLIENT_H +#ifndef HTSCLIENT_H_ +#define HTSCLIENT_H_ void client_start(void); @@ -27,4 +27,4 @@ void clients_enq_ref(int ref); void client_status_update(void); -#endif /* OUTPUT__CLIENT_H */ +#endif /* HTSCLIENT_H_ */ diff --git a/input_iptv.c b/iptv_input.c similarity index 99% rename from input_iptv.c rename to iptv_input.c index 48159f6f..b4123d8f 100644 --- a/input_iptv.c +++ b/iptv_input.c @@ -35,7 +35,7 @@ #include #include "tvhead.h" -#include "input_iptv.h" +#include "iptv_input.h" #include "channels.h" #include "transports.h" #include "dispatch.h" diff --git a/input_iptv.h b/iptv_input.h similarity index 92% rename from input_iptv.h rename to iptv_input.h index cb9d73fe..b2526e1e 100644 --- a/input_iptv.h +++ b/iptv_input.h @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef INPUT_IPTV_H -#define UNPUT_IPTV_H +#ifndef IPTV_INPUT_H_ +#define IPTV_INPUT_H_ int iptv_configure_transport(th_transport_t *t, const char *muxname); @@ -25,4 +25,4 @@ int iptv_start_feed(th_transport_t *t, unsigned int weight); int iptv_stop_feed(th_transport_t *t); -#endif /* INPUT_IPTV_H */ +#endif /* IPTV_INPUT_H_ */ diff --git a/output_multicast.c b/iptv_output.c similarity index 99% rename from output_multicast.c rename to iptv_output.c index f0b77414..e6dc7580 100644 --- a/output_multicast.c +++ b/iptv_output.c @@ -29,7 +29,7 @@ #include #include "tvhead.h" -#include "output_multicast.h" +#include "iptv_output.h" #include "dispatch.h" #include "channels.h" #include "transports.h" diff --git a/output_multicast.h b/iptv_output.h similarity index 90% rename from output_multicast.h rename to iptv_output.h index 52bd187a..91895327 100644 --- a/output_multicast.h +++ b/iptv_output.h @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -#ifndef OUTPUT_MULTICAST_H -#define OUTPUT_MULTICAST_H +#ifndef IPTV_OUTPUT_H_ +#define IPTV_OUTPUT_H_ void output_multicast_setup(void); -#endif /* OUTPUT_MULTICAST_H */ +#endif /* IPTV_OUTPUT_H_ */ diff --git a/main.c b/main.c index f3e45404..b4219a91 100644 --- a/main.c +++ b/main.c @@ -37,15 +37,15 @@ #include #include "tvhead.h" -#include "input_dvb.h" -#include "input_v4l.h" +#include "dvb.h" +#include "v4l.h" #include "channels.h" -#include "output_client.h" +#include "htsclient.h" #include "epg.h" #include "epg_xmltv.h" #include "pvr.h" #include "dispatch.h" -#include "output_multicast.h" +#include "iptv_output.h" int running; int xmltvreload; diff --git a/pvr.c b/pvr.c index e5dbfcb0..acffde07 100644 --- a/pvr.c +++ b/pvr.c @@ -37,7 +37,7 @@ #include "tvhead.h" #include "channels.h" #include "transports.h" -#include "output_client.h" +#include "htsclient.h" #include "pvr.h" #include "pvr_rec.h" #include "epg.h" diff --git a/pvr_rec.c b/pvr_rec.c index 3586924f..526d1201 100644 --- a/pvr_rec.c +++ b/pvr_rec.c @@ -38,7 +38,6 @@ #include "tvhead.h" #include "channels.h" #include "transports.h" -#include "output_client.h" #include "pvr.h" #include "epg.h" diff --git a/transports.c b/transports.c index a091cb7b..46d317a3 100644 --- a/transports.c +++ b/transports.c @@ -37,11 +37,12 @@ #include "tvhead.h" #include "dispatch.h" #include "dvb_dvr.h" -#include "input_v4l.h" -#include "input_iptv.h" #include "teletext.h" #include "transports.h" +#include "dvb_dvr.h" +#include "iptv_input.h" + /* * transport_mutex protects all operations concerning subscription lists */ diff --git a/input_v4l.c b/v4l.c similarity index 100% rename from input_v4l.c rename to v4l.c diff --git a/input_v4l.h b/v4l.h similarity index 93% rename from input_v4l.h rename to v4l.h index 7b0779d2..b502e592 100644 --- a/input_v4l.h +++ b/v4l.h @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef INPUT_V4L_H -#define INPUT_V4L_H +#ifndef V4L_H_ +#define V4L_H_ void v4l_add_adapters(void); @@ -27,4 +27,4 @@ int v4l_start_feed(th_transport_t *t, unsigned int weight); void v4l_stop_feed(th_transport_t *t); -#endif /* INPUT_V4L_H */ +#endif /* V4L_H */