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

rename IS_WEBTV => IS_WEBCHAN

Browse Source 
Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 740fd3ac0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

 Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-03 09:36:19 +01:00
committed by Thilo Graf
parent 2bcb7b4301
commit 34e83914e4
18 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.cpp
View File

@@ -1012,7 +1012,7 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons
printf("%s channel_id %" PRIx64 " epg: %" PRIx64 ", apidmode 0x%X\n", __func__,
eventinfo->channel_id, eventinfo->epgID, eventinfo->apids);
if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF /* || IS_WEBTV(eventinfo->channel_id) */)
if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF /* || IS_WEBCHAN(eventinfo->channel_id) */)
return false;
#if 1 // FIXME test
@@ -1031,7 +1031,7 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons
newdir = Directory;
mutex.lock();
if (IS_WEBTV(eventinfo->channel_id)) {
if (IS_WEBCHAN(eventinfo->channel_id)) {
inst = new CStreamRec(eventinfo, newdir, timeshift, StreamVTxtPid, StreamPmtPid, StreamSubtitlePids);
error_msg = inst->Record();
if(error_msg == RECORD_OK) {
@@ -1669,7 +1669,7 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, CFrontend *
/* if allocateFE was successful, full zapTo_serviceID
* needed, if record frontend same as live, and its on different TP */
bool found = (live_fe != frontend) || IS_WEBTV(live_channel_id) || SAME_TRANSPONDER(live_channel_id, channel_id);
bool found = (live_fe != frontend) || IS_WEBCHAN(live_channel_id) || SAME_TRANSPONDER(live_channel_id, channel_id);
/* stop all streams on that fe, if we going to change transponder */
if (!frontend->sameTsidOnid(channel->getTransponderId()))

8
src/driver/scanepg.cpp
View File

@@ -113,7 +113,7 @@ void CEpgScan::AddBouquet(CChannelList * clist)
{
for (unsigned i = 0; i < clist->Size(); i++) {
CZapitChannel * chan = clist->getChannelFromIndex(i);
if (!IS_WEBTV(chan->getChannelID()) && scanned.find(chan->getTransponderId()) == scanned.end())
if (!IS_WEBCHAN(chan->getChannelID()) && scanned.find(chan->getTransponderId()) == scanned.end())
scanmap.insert(eit_scanmap_pair_t(chan->getTransponderId(), chan->getChannelID()));
}
}
@@ -207,7 +207,7 @@ void CEpgScan::AddTransponders()
bool CEpgScan::CheckMode()
{
bool webtv = IS_WEBTV(CZapit::getInstance()->GetCurrentChannelID());
bool webtv = IS_WEBCHAN(CZapit::getInstance()->GetCurrentChannelID());
if ((g_settings.epg_scan_mode == CEpgScan::MODE_OFF)
|| (standby && !(g_settings.epg_scan_mode & MODE_STANDBY))
|| (!standby && !(g_settings.epg_scan_mode & MODE_LIVE))
@@ -275,7 +275,7 @@ int CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
INFO("EVT_ZAP_COMPLETE, scan map size: %zd\n", scanmap.size());
#if 0
t_channel_id chid = *(t_channel_id *)data;
if (IS_WEBTV(chid))
if (IS_WEBCHAN(chid))
Next();
#endif
return messages_return::handled;
@@ -368,7 +368,7 @@ void CEpgScan::Next()
CFrontend *pip_fe = NULL;
#endif
if (!standby) {
bool webtv = IS_WEBTV(CZapit::getInstance()->GetCurrentChannelID());
bool webtv = IS_WEBCHAN(CZapit::getInstance()->GetCurrentChannelID());
if (!webtv) {
llocked = true;
live_fe = CZapit::getInstance()->GetLiveFrontend();

8
src/driver/streamts.cpp
View File

@@ -311,7 +311,7 @@ CFrontend * CStreamManager::FindFrontend(CZapitChannel * channel)
CFEManager::getInstance()->Lock();
bool unlock = false;
if (!IS_WEBTV(live_channel_id)) {
if (!IS_WEBCHAN(live_channel_id)) {
unlock = true;
CFEManager::getInstance()->lockFrontend(live_fe);
}
@@ -334,7 +334,7 @@ CFrontend * CStreamManager::FindFrontend(CZapitChannel * channel)
CFEManager::getInstance()->Unlock();
if (frontend) {
bool found = (live_fe != frontend) || IS_WEBTV(live_channel_id) || SAME_TRANSPONDER(live_channel_id, chid);
bool found = (live_fe != frontend) || IS_WEBCHAN(live_channel_id) || SAME_TRANSPONDER(live_channel_id, chid);
bool ret = false;
if (found)
ret = zapit.zapTo_record(chid) > 0;
@@ -430,7 +430,7 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
return false;
printf("CStreamManager::Parse: channel_id %" PRIx64 " [%s]\n", chid, channel->getName().c_str());
if (IS_WEBTV(chid))
if (IS_WEBCHAN(chid))
return true;
frontend = FindFrontend(channel);
@@ -515,7 +515,7 @@ bool CStreamManager::AddClient(int connfd)
it->second->AddClient(connfd);
} else {
CStreamInstance * stream;
if (IS_WEBTV(channel_id)) {
if (IS_WEBCHAN(channel_id)) {
stream = new CStreamStream(connfd, channel_id, pids);
} else {
stream = new CStreamInstance(connfd, channel_id, pids);