69 files changed, 1345 insertions, 1340 deletions

diff --git a/tvapi/libtv/tv/CTvEpg.cpp b/tvapi/libtv/tv/CTvEpg.cpp
index a46f9a9..d1ead7f 100644
--- a/tvapi/libtv/tv/CTvEpg.cpp
+++ b/tvapi/libtv/tv/CTvEpg.cpp
@@ -4,14 +4,12 @@
  *@ Date : 2013-12
  *@ Author :
 */
+#define LOG_TAG "CTvEpg"
+
 #include "CTvEpg.h"
 #include "CTvChannel.h"
-#ifdef LOG_TAG
-#undef LOG_TAG
-#define LOG_TAG "CTvEpg"
-#endif
 
-void CTvEpg::epg_evt_callback(long dev_no, int event_type, void *param, void *user_data)
+void CTvEpg::epg_evt_callback(long dev_no, int event_type, void *param, void *user_data __unused)
 {
     CTvEpg *pEpg;