Rename files to better names

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

channels.c

@@ -31,9 +31,9 @@
 #include <libhts/htscfg.h>
 
 #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"

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"

dvb.h

@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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_ */

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"

epg_xmltv.c

@@ -35,7 +35,6 @@
 #include "channels.h"
 #include "epg.h"
 #include "epg_xmltv.h"
-#include "output_client.h"
 
 extern int xmltvreload;
 

htsclient.h

@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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_ */

iptv_input.c

@@ -35,7 +35,7 @@
 #include <libhts/htscfg.h>
 
 #include "tvhead.h"
-#include "input_iptv.h"
+#include "iptv_input.h"
 #include "channels.h"
 #include "transports.h"
 #include "dispatch.h"

iptv_input.h

@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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_ */

iptv_output.c

@@ -29,7 +29,7 @@
 #include <arpa/inet.h>
 
 #include "tvhead.h"
-#include "output_multicast.h"
+#include "iptv_output.h"
 #include "dispatch.h"
 #include "channels.h"
 #include "transports.h"

iptv_output.h

@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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_ */

main.c

@@ -37,15 +37,15 @@
 #include <ffmpeg/avformat.h>
 
 #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;

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"

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"
 

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
  */

v4l.h

@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 */