From 96e7c51cffa9ae0fd6dcb2f28fac49f7f10bfe13 Mon Sep 17 00:00:00 2001
From: "[CST] Bas" <bas@coolstreamtech.com>
Date: Tue, 6 Mar 2012 14:50:02 +0800
Subject: [PATCH] eitd: Fix files according to the new includes branch.

---
 src/eitd/Makefile.am    |  1 +
 src/eitd/SIevents.cpp   |  8 ++++----
 src/eitd/SIevents.hpp   |  2 +-
 src/eitd/SIlanguage.cpp |  4 ++--
 src/eitd/SIsections.cpp | 20 ++++++++++----------
 src/eitd/dmx.cpp        | 10 ++++++----
 src/eitd/dmxapi.cpp     |  9 ++-------
 src/eitd/edvbstring.cpp |  4 ++--
 src/eitd/eitd.h         |  2 +-
 src/eitd/sectionsd.cpp  |  2 +-
 src/eitd/xmlutil.cpp    |  5 +++--
 11 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am
index acebc9192..169f48b42 100644
--- a/src/eitd/Makefile.am
+++ b/src/eitd/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/eitd/SIevents.cpp b/src/eitd/SIevents.cpp
index cff53a81e..37be2ff54 100644
--- a/src/eitd/SIevents.cpp
+++ b/src/eitd/SIevents.cpp
@@ -26,10 +26,6 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "SIlanguage.hpp"
-#include "SIutils.hpp"
-#include "SIevents.hpp"
-
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/short_event_descriptor.h>
 #include <dvbsi++/extended_event_descriptor.h>
@@ -38,6 +34,10 @@
 #include <dvbsi++/content_descriptor.h>
 #include <dvbsi++/parental_rating_descriptor.h>
 
+#include "SIlanguage.hpp"
+#include "SIutils.hpp"
+#include "SIevents.hpp"
+
 const std::string languangeOFF = "OFF";
 
 SIevent::SIevent(const t_original_network_id _original_network_id, const t_transport_stream_id _transport_stream_id, const t_service_id _service_id,
diff --git a/src/eitd/SIevents.hpp b/src/eitd/SIevents.hpp
index da7b75122..54f15c3b6 100644
--- a/src/eitd/SIevents.hpp
+++ b/src/eitd/SIevents.hpp
@@ -31,8 +31,8 @@
 #include <string>
 
 #include <sectionsdclient/sectionsdtypes.h>
-#include "edvbstring.h"
 #include <dvbsi++/event_information_section.h>
+#include "edvbstring.h"
 
 class SIlinkage {
 public:
diff --git a/src/eitd/SIlanguage.cpp b/src/eitd/SIlanguage.cpp
index f3de09c0d..a0c7e4b26 100644
--- a/src/eitd/SIlanguage.cpp
+++ b/src/eitd/SIlanguage.cpp
@@ -38,8 +38,6 @@
 //
 //
 
-#include "SIlanguage.hpp"
-
 #include <string>
 #include <vector>
 #include <map>
@@ -48,6 +46,8 @@
 
 #include <sectionsdclient/sectionsdclient.h>
 
+#include "SIlanguage.hpp"
+
 #define LANGUAGEFILE "/var/tuxbox/config/epglanguages.conf"
 
 std::vector<std::string> SIlanguage::languages;
diff --git a/src/eitd/SIsections.cpp b/src/eitd/SIsections.cpp
index 8273a4fb5..1ba629f2b 100644
--- a/src/eitd/SIsections.cpp
+++ b/src/eitd/SIsections.cpp
@@ -23,25 +23,25 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include <stdio.h>
 #include <unistd.h>
 
+#include <dvbsi++/descriptor_tag.h>
+#include <dvbsi++/nvod_reference_descriptor.h>
+#include <dvbsi++/service_descriptor.h>
+#include <dvbsi++/time_offset_section.h>
+#include <dvbsi++/time_date_section.h>
+#include <dvbsi++/local_time_offset_descriptor.h>
+
 #include "SIutils.hpp"
 #include "SIservices.hpp"
 #include "SIevents.hpp"
 #include "SIsections.hpp"
 #include "debug.h"
-#include <edvbstring.h>
-
-#include <dvbsi++/descriptor_tag.h>
-#include <dvbsi++/nvod_reference_descriptor.h>
-#include <dvbsi++/service_descriptor.h>
-
-#include <dvbsi++/time_offset_section.h>
-#include <dvbsi++/time_date_section.h>
-#include <dvbsi++/local_time_offset_descriptor.h>
-
+#include "edvbstring.h"
 
 void SIsectionEIT::parse(void)
 {
diff --git a/src/eitd/dmx.cpp b/src/eitd/dmx.cpp
index cd41c5759..2d9bf3272 100644
--- a/src/eitd/dmx.cpp
+++ b/src/eitd/dmx.cpp
@@ -23,9 +23,9 @@
  */
 
 
-#include <dmx.h>
-#include <dmxapi.h>
-#include <debug.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <endian.h>
 #include <errno.h>
@@ -39,8 +39,10 @@
 #include <map>
 
 #include <driver/abstime.h>
-
 #include <dvbsi++/long_section.h>
+
+#include "dmx.h"
+#include "dmxapi.h"
 #include "debug.h"
 
 //#define DEBUG_MUTEX 1
diff --git a/src/eitd/dmxapi.cpp b/src/eitd/dmxapi.cpp
index c567b5818..10639a8ac 100644
--- a/src/eitd/dmxapi.cpp
+++ b/src/eitd/dmxapi.cpp
@@ -30,14 +30,9 @@
 #include <unistd.h>        /* close, read */
 #include <arpa/inet.h>     /* htons */
 #include <time.h>          /* ctime */
-#include <dmxapi.h>
-
-#if HAVE_TRIPLEDRAGON
-#include <dmx_td.h>
-#else
-#include <dmx_cs.h>
-#endif
+#include "dmxapi.h"
 
+#include "dmx.h"
 #include "SIutils.hpp"
 #include "debug.h"
 
diff --git a/src/eitd/edvbstring.cpp b/src/eitd/edvbstring.cpp
index bdf713626..fb9336994 100644
--- a/src/eitd/edvbstring.cpp
+++ b/src/eitd/edvbstring.cpp
@@ -1,11 +1,11 @@
 #include <string>
 #include <ctype.h>
 #include <limits.h>
-#include <debug.h>
 #include <map>
 #include <set>
 
-#include <SIutils.hpp>
+#include "SIutils.hpp"
+#include "debug.h"
 
 std::map<std::string, int> CountryCodeDefaultMapping;
 std::map<int, int> TransponderDefaultMapping;
diff --git a/src/eitd/eitd.h b/src/eitd/eitd.h
index 7ce153dd7..860789f51 100644
--- a/src/eitd/eitd.h
+++ b/src/eitd/eitd.h
@@ -37,7 +37,7 @@
 #include "SIevents.hpp"
 #include "SIsections.hpp"
 #include "SIlanguage.hpp"
-
+#include "debug.h"
 //#define USE_BOOST_SHARED_PTR
 #ifdef USE_BOOST_SHARED_PTR
 #include <boost/shared_ptr.hpp>
diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index 07b03b0f9..116b5b3b2 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -25,7 +25,6 @@
 
 #include <config.h>
 #include <malloc.h>
-#include <debug.h>
 
 #include <unistd.h>
 #include <string.h>
@@ -60,6 +59,7 @@
 #include "eitd.h"
 #include "edvbstring.h"
 #include "xmlutil.h"
+#include "debug.h"
 
 //#define ENABLE_SDT //FIXME
 
diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp
index 0660fb3a4..ac07a6074 100644
--- a/src/eitd/xmlutil.cpp
+++ b/src/eitd/xmlutil.cpp
@@ -22,9 +22,9 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-
-#include <debug.h>
+#endif
 
 #include <unistd.h>
 #include <string.h>
@@ -40,6 +40,7 @@
 
 #include "xmlutil.h"
 #include "eitd.h"
+#include "debug.h"
 
 void addEvent(const SIevent &evt, const time_t zeit, bool cn = false);
 extern MySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey;