- make ait scan for hbbtv url configurable

configure.ac

@@ -180,6 +180,11 @@ AC_ARG_ENABLE(graphlcd,
 	AC_DEFINE(ENABLE_GRAPHLCD, 1, [enable GraphLCD support]))
 AM_CONDITIONAL(ENABLE_GRAPHLCD, test "$enable_graphlcd" = "yes")
 
+AC_ARG_ENABLE(hbbtv,
+	AS_HELP_STRING([--enable-hbbtv], [enable HBBTV support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_HBBTV, 1, [enable HBBTV support]))
+AM_CONDITIONAL(ENABLE_HBBTV, test "$enable_hbbtv" = "yes")
+
 AC_ARG_ENABLE(keyboard-no-rc,
 	AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]),
 	AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control]))

src/zapit/include/zapit/channel.h

@@ -142,7 +142,9 @@ class CZapitChannel
 
 		unsigned short			pcrPid;
 		unsigned short			pmtPid;
+#if ENABLE_HBBTV
 		unsigned short			aitPid;
+#endif
 		unsigned short			teletextPid;
 		unsigned short			videoPid;
 		unsigned short			audioPid;
@@ -244,7 +246,9 @@ class CZapitChannel
 		unsigned char 		getAudioChannelCount(void)	{ return (unsigned char) audioChannels.size(); }
 		unsigned short		getPcrPid(void)			{ return pcrPid; }
 		unsigned short		getPmtPid(void)			{ return pmtPid; }
+#if ENABLE_HBBTV
 		unsigned short		getAitPid(void)			{ return aitPid; }
+#endif
 		unsigned short		getTeletextPid(void)		{ return teletextPid; }
 		const char *		getTeletextLang(void)		{ return ttx_language_code.c_str(); }
 		unsigned short		getVideoPid(void)		{ return videoPid; }
@@ -268,7 +272,9 @@ class CZapitChannel
 		void setAudioChannel(unsigned char pAudioChannel)	{ if (pAudioChannel < audioChannels.size()) currentAudioChannel = pAudioChannel; }
 		void setPcrPid(unsigned short pPcrPid)			{ pcrPid = pPcrPid; }
 		void setPmtPid(unsigned short pPmtPid)			{ pmtPid = pPmtPid; }
+#if ENABLE_HBBTV
 		void setAitPid(unsigned short pAitPid)			{ aitPid = pAitPid; }
+#endif
 		void setTeletextPid(unsigned short pTeletextPid)	{ teletextPid = pTeletextPid; }
 		void setTeletextLang(std::string lang)			{ ttx_language_code = lang; };
 		void setVideoPid(unsigned short pVideoPid)		{ videoPid = pVideoPid; }

src/zapit/include/zapit/zapit.h

@@ -19,7 +19,9 @@
 #include <zapit/bouquets.h>
 #include <zapit/femanager.h>
 #include <zapit/fastscan.h>
+#if ENABLE_HBBTV
 #include <zapit/scanait.h>
+#endif
 
 #define PAL	0
 #define NTSC	1
@@ -168,7 +170,9 @@ class CZapit : public OpenThreads::Thread
 		t_channel_id  lastChannelTV;
 		int abort_zapit;
 		int pmt_update_fd;
+#if ENABLE_HBBTV
 		CAit *ait;
+#endif
 		//void LoadAudioMap();
 		void SaveAudioMap();
 		void SaveVolumeMap();

src/zapit/src/Makefile.am

@@ -25,7 +25,6 @@ libzapit_a_SOURCES = \
 	frontend.cpp \
 	getservices.cpp \
 	pat.cpp \
-	scanait.cpp \
 	scanbat.cpp \
 	scan.cpp \
 	scannit.cpp \
@@ -39,6 +38,11 @@ libzapit_a_SOURCES += \
 	fastscan.cpp
 endif
 
+if ENABLE_HBBTV
+libzapit_a_SOURCES += \
+	scanait.cpp
+endif
+
 bin_PROGRAMS = pzapit
 
 pzapit_SOURCES = \

src/zapit/src/channel.cpp

@@ -114,7 +114,9 @@ void CZapitChannel::Init()
 	bUseCI = false;
 	altlogo = "";
 	epgmapper = "";
+#if ENABLE_HBBTV
 	aitPid = 0;
+#endif
 }
 
 CZapitChannel::~CZapitChannel(void)

src/zapit/src/scanpmt.cpp

@@ -38,10 +38,12 @@
 #include <dvbsi++/teletext_descriptor.h>
 #include <dvbsi++/subtitling_descriptor.h>
 #include <dvbsi++/vbi_teletext_descriptor.h>
+#if ENABLE_HBBTV
 #include <dvbsi++/application_information_section.h>
 #include <dvbsi++/application_name_descriptor.h>
 #include <dvbsi++/application_profile.h>
 #include <dvbsi++/application_descriptor.h>
+#endif
 
 #define DEBUG_PMT
 //#define DEBUG_PMT_UNUSED
@@ -335,6 +337,7 @@ bool CPmt::ParseEsInfo(ElementaryStreamInfo *esinfo, CZapitChannel * const chann
 		audio_type = CZapitAudioChannel::EAC3;
 		audio = true;
 		break;
+#if ENABLE_HBBTV
 	case STREAM_TYPE_PRIVATE_SECTION:
 		for (DescriptorConstIterator desc = esinfo->getDescriptors()->begin(); desc != esinfo->getDescriptors()->end(); ++desc)
 		{
@@ -347,6 +350,7 @@ bool CPmt::ParseEsInfo(ElementaryStreamInfo *esinfo, CZapitChannel * const chann
 			}
 		}
 		break;
+#endif
 	default:
 #ifdef DEBUG_PMT_UNUSED
 		printf("PMT: pid %04x stream_type: %02x\n", esinfo->getPid(), stream_type);

src/zapit/src/zapit.cpp

@@ -141,7 +141,9 @@ CZapit::CZapit()
 	pip_channel_id = 0;
 	lock_channel_id = 0;
 	pip_fe = NULL;
+#if ENABLE_HBBTV
 	ait = new CAit();
+#endif
 }
 
 CZapit::~CZapit()
@@ -664,8 +666,10 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
 	if (update_pmt)
 		pmt_set_update_filter(current_channel, &pmt_update_fd);
 
+#if ENABLE_HBBTV
 	ait->setDemux(current_channel->getRecordDemux());
 	ait->Parse(current_channel);
+#endif
 
 	return true;
 }