rename ENABLE_AIT => ENABLE_AITSCAN

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5cf110f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-01-02 (Tue, 02 Jan 2024)

Origin message was:
------------------
- rename ENABLE_AIT => ENABLE_AITSCAN

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2024-01-02 00:43:08 +01:00
parent 839eb017bc
commit 9c7abd0880
7 changed files with 15 additions and 15 deletions

View File

@@ -315,9 +315,9 @@ AC_ARG_ENABLE(aitscan,
[enable_aitscan="yes"]) [enable_aitscan="yes"])
if test "$enable_aitscan" = "yes"; then if test "$enable_aitscan" = "yes"; then
AC_DEFINE(ENABLE_AIT, 1, [enable Application Information Table support]) AC_DEFINE(ENABLE_AITSCAN, 1, [enable Application Information Table support])
fi fi
AM_CONDITIONAL(ENABLE_AIT, test "$enable_aitscan" = "yes") AM_CONDITIONAL(ENABLE_AITSCAN, test "$enable_aitscan" = "yes")
AC_ARG_ENABLE(giflib, AC_ARG_ENABLE(giflib,
AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]), AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]),

View File

@@ -144,7 +144,7 @@ class CZapitChannel
unsigned short pcrPid; unsigned short pcrPid;
unsigned short pmtPid; unsigned short pmtPid;
#if ENABLE_AIT #if ENABLE_AITSCAN
unsigned short aitPid; unsigned short aitPid;
#endif #endif
unsigned short teletextPid; unsigned short teletextPid;
@@ -250,7 +250,7 @@ class CZapitChannel
unsigned char getAudioChannelCount(void) { return (unsigned char) audioChannels.size(); } unsigned char getAudioChannelCount(void) { return (unsigned char) audioChannels.size(); }
unsigned short getPcrPid(void) { return pcrPid; } unsigned short getPcrPid(void) { return pcrPid; }
unsigned short getPmtPid(void) { return pmtPid; } unsigned short getPmtPid(void) { return pmtPid; }
#if ENABLE_AIT #if ENABLE_AITSCAN
unsigned short getAitPid(void) { return aitPid; } unsigned short getAitPid(void) { return aitPid; }
#endif #endif
unsigned short getTeletextPid(void) { return teletextPid; } unsigned short getTeletextPid(void) { return teletextPid; }
@@ -276,7 +276,7 @@ class CZapitChannel
void setAudioChannel(unsigned char pAudioChannel) { if (pAudioChannel < audioChannels.size()) currentAudioChannel = pAudioChannel; } void setAudioChannel(unsigned char pAudioChannel) { if (pAudioChannel < audioChannels.size()) currentAudioChannel = pAudioChannel; }
void setPcrPid(unsigned short pPcrPid) { pcrPid = pPcrPid; } void setPcrPid(unsigned short pPcrPid) { pcrPid = pPcrPid; }
void setPmtPid(unsigned short pPmtPid) { pmtPid = pPmtPid; } void setPmtPid(unsigned short pPmtPid) { pmtPid = pPmtPid; }
#if ENABLE_AIT #if ENABLE_AITSCAN
void setAitPid(unsigned short pAitPid) { aitPid = pAitPid; } void setAitPid(unsigned short pAitPid) { aitPid = pAitPid; }
#endif #endif
void setTeletextPid(unsigned short pTeletextPid) { teletextPid = pTeletextPid; } void setTeletextPid(unsigned short pTeletextPid) { teletextPid = pTeletextPid; }

View File

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

View File

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

View File

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

View File

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

View File

@@ -150,14 +150,14 @@ CZapit::CZapit()
pip_fe[i] = NULL; pip_fe[i] = NULL;
} }
#endif #endif
#if ENABLE_AIT #if ENABLE_AITSCAN
ait = new CAit(); ait = new CAit();
#endif #endif
} }
CZapit::~CZapit() CZapit::~CZapit()
{ {
#if ENABLE_AIT #if ENABLE_AITSCAN
delete ait; delete ait;
#endif #endif
Stop(); Stop();
@@ -682,7 +682,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
if (update_pmt) if (update_pmt)
pmt_set_update_filter(current_channel, &pmt_update_fd); pmt_set_update_filter(current_channel, &pmt_update_fd);
#if ENABLE_AIT #if ENABLE_AITSCAN
ait->setDemux(current_channel->getRecordDemux()); ait->setDemux(current_channel->getRecordDemux());
ait->Parse(current_channel); ait->Parse(current_channel);
#endif #endif
@@ -2527,7 +2527,7 @@ bool CZapit::StopPlayBack(bool send_pmt, bool blank)
/* hack. if standby, dont blank video -> for paused timeshift */ /* hack. if standby, dont blank video -> for paused timeshift */
videoDecoder->Stop(standby ? false : blank); videoDecoder->Stop(standby ? false : blank);
#if ENABLE_AIT #if ENABLE_AITSCAN
ait->Stop(); ait->Stop();
#endif #endif
#ifdef USE_VBI #ifdef USE_VBI