Rename files to better names

diff --git a/Makefile b/Makefile
index f3f86149a747d6989ca0f9714f7304434077633d..074733558a6f7e6d0d2efc94ec0329b5b7757fe8 100644 (file)
--- 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 1db448efd766312bff77dca99918893df0bdb35c..6e36f2f65fdb010e57b6e18681490cb0ab62725c 100644 (file)
--- a/channels.c
+++ b/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"

diff --git a/input_dvb.c b/dvb.c
similarity index 99%
rename from input_dvb.c
rename to dvb.c
index 64458ec27b531de7980b869dc19f76d5105fac09..04b99705f856572501df6ba0b5ff3ad7133df8e8 100644 (file)
--- 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 f5fdc4704296d31242bd78db3de8ce8b766ea53a..616e2b9b9a9dfde6a96675717e60d587fcc1fbb9 100644 (file)
--- a/input_dvb.h
+++ b/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_ */

diff --git a/dvb_dvr.c b/dvb_dvr.c
index 78b5988eecb897fbe3e858a926d3b76171e8d1db..e4e34bcdcebcd9dd039f6676b430dfe0771496e5 100644 (file)
--- 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 489c004d5e6311d4aff3adb308663c9d49bab87a..765c83a23865603b8cc600c800d9661dd3521678 100644 (file)
--- 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 2da4f8e6bde6b2613522533689d61a47b0b02ffa..0d1d65d54f4162cf251685df7219d2b5a428cff9 100644 (file)
--- a/output_client.h
+++ b/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_ */

diff --git a/input_iptv.c b/iptv_input.c
similarity index 99%
rename from input_iptv.c
rename to iptv_input.c
index 48159f6fa2c7ca100e7c9da8ee38110fbe0434b7..b4123d8f23719bc01253b3621cdf789897c8e9b2 100644 (file)
--- a/input_iptv.c
+++ b/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"

diff --git a/input_iptv.h b/iptv_input.h
similarity index 92%
rename from input_iptv.h
rename to iptv_input.h
index cb9d73fe793de0732cfe2c80f7e12106ded62349..b2526e1e1cb78103a72079a0c0f02d5c99438a67 100644 (file)
--- a/input_iptv.h
+++ b/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_ */

diff --git a/output_multicast.c b/iptv_output.c
similarity index 99%
rename from output_multicast.c
rename to iptv_output.c
index f0b77414f124c80c1b22a06711672ab83a689893..e6dc75805b4e6fdade18e47d46f271db9047d390 100644 (file)
--- a/output_multicast.c
+++ b/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"

diff --git a/output_multicast.h b/iptv_output.h
similarity index 90%
rename from output_multicast.h
rename to iptv_output.h
index 52bd187ac98a80cf85993c70098aa7914a10bdec..918953275054d70753dda20d754115698e6adf93 100644 (file)
--- a/output_multicast.h
+++ b/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_ */

diff --git a/main.c b/main.c
index f3e4540496b33341114f771b5023a8aeb2013277..b4219a91412c27f598f8625e087d2c2b2f7d71a4 100644 (file)
--- a/main.c
+++ b/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;

diff --git a/pvr.c b/pvr.c
index e5dbfcb0898877ee0100bff30db0c632d42a4986..acffde07baade14cceb1df97cbc5d3898dd1ad19 100644 (file)
--- 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 3586924f309ee672a9d18931ce05bec109c44112..526d120153ad16cd05c62337443536e2966f39e3 100644 (file)
--- 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 a091cb7b320d4d9bfdcd246a8d110b9dc8f675d0..46d317a3ca62f476e273534441b048f2b6732924 100644 (file)
--- 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 7b0779d2fa006bcdb2d9eb9bfdb05ddd044ff320..b502e592ff847e5a4403bd387c21dcc8c9c2d157 100644 (file)
--- a/input_v4l.h
+++ b/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 */