mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure: rename ENABLE_HBBTV => ENABLE_AIT

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9abe424ae0
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-09-29 (Wed, 29 Sep 2021)

Origin message was:
------------------
- configure: rename ENABLE_HBBTV => ENABLE_AIT

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-09-29 21:14:46 +02:00
parent 89b7b1662a
commit b45931f7ce
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@@ -208,6 +208,16 @@ AC_ARG_ENABLE(fastscan,
AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code]))
AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes")
AC_ARG_ENABLE(aitscan,
AS_HELP_STRING([--enable-aitscan], [enable Application Information Table support @<:@default=yes@:>@]),
[enable_aitscan="$enableval"],
[enable_aitscan="yes"])
if test "$enable_aitscan" = "yes"; then
AC_DEFINE(ENABLE_AIT, 1, [enable Application Information Table support])
fi
AM_CONDITIONAL(ENABLE_AIT, test "$enable_aitscan" = "yes")
AC_ARG_ENABLE(giflib,
AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]),
AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]))
@@ -223,16 +233,6 @@ AC_ARG_ENABLE(flac,
AC_DEFINE(ENABLE_FLAC, 1, [enable FLAC support]))
AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes")
AC_ARG_ENABLE(hbbtv,
AS_HELP_STRING([--enable-hbbtv], [enable HbbTV support @<:@default=yes@:>@]),
[enable_hbbtv="$enableval"],
[enable_hbbtv="yes"])
if test "$enable_hbbtv" = "yes"; then
AC_DEFINE(ENABLE_HBBTV, 1, [enable HbbTV support])
fi
AM_CONDITIONAL(ENABLE_HBBTV, test "$enable_hbbtv" = "yes")
AC_ARG_ENABLE(upnp,
AS_HELP_STRING([--enable-upnp], [enable UPNP support @<:@default=yes@:>@]),
[enable_upnp="$enableval"],

6
src/zapit/include/zapit/channel.h
View File

@@ -142,7 +142,7 @@ class CZapitChannel
unsigned short pcrPid;
unsigned short pmtPid;
#if ENABLE_HBBTV
#if ENABLE_AIT
unsigned short aitPid;
#endif
unsigned short teletextPid;
@@ -246,7 +246,7 @@ 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
#if ENABLE_AIT
unsigned short getAitPid(void) { return aitPid; }
#endif
unsigned short getTeletextPid(void) { return teletextPid; }
@@ -272,7 +272,7 @@ 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
#if ENABLE_AIT
void setAitPid(unsigned short pAitPid) { aitPid = pAitPid; }
#endif
void setTeletextPid(unsigned short pTeletextPid) { teletextPid = pTeletextPid; }

4
src/zapit/include/zapit/zapit.h
View File

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

2
src/zapit/src/Makefile.am
View File

@@ -38,7 +38,7 @@ libzapit_a_SOURCES += \
fastscan.cpp
endif
if ENABLE_HBBTV
if ENABLE_AIT
libzapit_a_SOURCES += \
scanait.cpp
endif

2
src/zapit/src/channel.cpp
View File

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

4
src/zapit/src/scanpmt.cpp
View File

@@ -38,7 +38,7 @@
#include <dvbsi++/teletext_descriptor.h>
#include <dvbsi++/subtitling_descriptor.h>
#include <dvbsi++/vbi_teletext_descriptor.h>
#if ENABLE_HBBTV
#if ENABLE_AIT
#include <dvbsi++/application_information_section.h>
#include <dvbsi++/application_name_descriptor.h>
#include <dvbsi++/application_profile.h>
@@ -337,7 +337,7 @@ bool CPmt::ParseEsInfo(ElementaryStreamInfo *esinfo, CZapitChannel * const chann
audio_type = CZapitAudioChannel::EAC3;
audio = true;
break;
#if ENABLE_HBBTV
#if ENABLE_AIT
case STREAM_TYPE_PRIVATE_SECTION:
for (DescriptorConstIterator desc = esinfo->getDescriptors()->begin(); desc != esinfo->getDescriptors()->end(); ++desc)
{

4
src/zapit/src/zapit.cpp
View File

@@ -141,7 +141,7 @@ CZapit::CZapit()
pip_channel_id = 0;
lock_channel_id = 0;
pip_fe = NULL;
#if ENABLE_HBBTV
#if ENABLE_AIT
ait = new CAit();
#endif
}
@@ -666,7 +666,7 @@ 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
#if ENABLE_AIT
ait->setDemux(current_channel->getRecordDemux());
ait->Parse(current_channel);
#endif