From 740fd3ac0d883a673940c6bc4dd4f3b16cd59427 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 3 Nov 2017 09:36:19 +0100 Subject: [PATCH] - rename IS_WEBTV => IS_WEBCHAN Conflicts: src/zapit/src/capmt.cpp Signed-off-by: Thilo Graf --- src/daemonc/remotecontrol.cpp | 6 +++--- src/driver/record.cpp | 6 +++--- src/driver/scanepg.cpp | 8 ++++---- src/driver/streamts.cpp | 8 ++++---- src/gui/audio_select.cpp | 2 +- src/gui/bedit/bouqueteditor_channels.cpp | 2 +- src/gui/bedit/bouqueteditor_chanselect.cpp | 2 +- src/gui/channellist.cpp | 16 ++++++++-------- src/gui/eventlist.cpp | 4 ++-- src/gui/infoviewer.cpp | 10 +++++----- src/gui/infoviewer_bb.cpp | 4 ++-- src/gui/movieplayer.cpp | 2 +- src/gui/streaminfo2.cpp | 4 ++-- src/gui/webtv_setup.cpp | 2 +- src/neutrino.cpp | 4 ++-- src/zapit/include/zapit/types.h | 2 +- src/zapit/src/capmt.cpp | 2 +- src/zapit/src/zapit.cpp | 14 +++++++------- 18 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp index 03f8591d2..271ec3fe6 100644 --- a/src/daemonc/remotecontrol.cpp +++ b/src/daemonc/remotecontrol.cpp @@ -125,7 +125,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data //printf("[neutrino] timeout EVT_ZAP current %llx data %llx\n", current_channel_id, *(t_channel_id *)data); if ((*(t_channel_id *)data) != current_channel_id) { g_InfoViewer->chanready = 0; - if (!IS_WEBTV(current_channel_id)) + if (!IS_WEBCHAN(current_channel_id)) g_Sectionsd->setServiceStopped(); CMoviePlayerGui::getInstance().stopPlayBack(); g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id ); @@ -348,7 +348,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data else if (msg == NeutrinoMessages::EVT_TUNE_COMPLETE) { t_channel_id chid = *(t_channel_id *)data; printf("CRemoteControl::handleMsg: EVT_TUNE_COMPLETE (%016" PRIx64 ")\n", chid); - if(chid && !IS_WEBTV(chid)) + if(chid && !IS_WEBCHAN(chid)) g_Sectionsd->setServiceChanged(chid, false); return messages_return::handled; } @@ -730,7 +730,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s g_RCInput->killTimer(scrambled_timer); //dvbsub_pause(true); CZapit::getInstance()->Abort(); - if (!IS_WEBTV(channel_id)) + if (!IS_WEBCHAN(channel_id)) g_Sectionsd->setServiceStopped(); CMoviePlayerGui::getInstance().stopPlayBack(); g_Zapit->zapTo_serviceID_NOWAIT(channel_id); diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 16f909e89..ba6301286 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -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())) diff --git a/src/driver/scanepg.cpp b/src/driver/scanepg.cpp index da91163ea..a96fd5c94 100644 --- a/src/driver/scanepg.cpp +++ b/src/driver/scanepg.cpp @@ -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(); diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index 12c8d937a..cf7bd78ca 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -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); diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp index 08a750648..500558b2b 100644 --- a/src/gui/audio_select.cpp +++ b/src/gui/audio_select.cpp @@ -61,7 +61,7 @@ CAudioSelectMenuHandler::CAudioSelectMenuHandler() AudioSelector = NULL; width = 40; mp = &CMoviePlayerGui::getInstance(); - if (IS_WEBTV(g_Zapit->getCurrentServiceID())) + if (IS_WEBCHAN(g_Zapit->getCurrentServiceID())) mp = &CMoviePlayerGui::getInstance(true); } diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index e862ca5ca..ab7679a8d 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -173,7 +173,7 @@ std::string CBEChannelWidget::getInfoText(int index) return res; std::string satname = CServiceManager::getInstance()->GetSatelliteName((*Channels)[index]->getSatellitePosition()); - if (IS_WEBTV((*Channels)[index]->getChannelID())) + if (IS_WEBCHAN((*Channels)[index]->getChannelID())) satname = "Web-Channel"; // TODO split into WebTV/WebRadio transponder t; CServiceManager::getInstance()->GetTransponder((*Channels)[index]->getTransponderId(), t); diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 4e035795a..54af0f326 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -177,7 +177,7 @@ std::string CBEChannelSelectWidget::getInfoText(int index) return res; std::string satname = CServiceManager::getInstance()->GetSatelliteName(Channels[index]->getSatellitePosition()); - if (IS_WEBTV(Channels[index]->getChannelID())) + if (IS_WEBCHAN(Channels[index]->getChannelID())) satname = "Web-Channel"; // TODO split into WebTV/WebRadio transponder t; CServiceManager::getInstance()->GetTransponder(Channels[index]->getTransponderId(), t); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 0406b062e..ab0bc6668 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -657,7 +657,7 @@ int CChannelList::show() } } else if(!edit_state && !empty && msg == (neutrino_msg_t) g_settings.key_record) { //start direct recording from channellist - if((g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) && SameTP() /* && !IS_WEBTV((*chanlist)[selected]->getChannelID()) */) { + if((g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) && SameTP() /* && !IS_WEBCHAN((*chanlist)[selected]->getChannelID()) */) { printf("[neutrino channellist] start direct recording...\n"); hide(); if (!CRecordManager::getInstance()->Record((*chanlist)[selected]->getChannelID())) { @@ -1550,7 +1550,7 @@ void CChannelList::paintDetails(int index) else p_event = &(*chanlist)[index]->currentEvent; - if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) { + if (/* !IS_WEBCHAN((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) { char cNoch[50] = {0}; // UTF-8 char cSeit[50] = {0}; // UTF-8 @@ -1614,10 +1614,10 @@ void CChannelList::paintDetails(int index) g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- OFFSET_INNER_MID- seit_len, ypos_a + fheight , seit_len, cSeit, colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- OFFSET_INNER_MID- noch_len, ypos_a + fdescrheight+ fheight, noch_len, cNoch, colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT); } - else if (IS_WEBTV((*chanlist)[index]->getChannelID())) { + else if (IS_WEBCHAN((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ OFFSET_INNER_MID, ypos_a + fheight, full_width - 3*OFFSET_INNER_MID, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true); } - if (g_settings.channellist_foot == 0 && IS_WEBTV((*chanlist)[index]->getChannelID())) { + if (g_settings.channellist_foot == 0 && IS_WEBCHAN((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ OFFSET_INNER_MID, ypos_a + 2*fheight + fdescrheight, full_width - 3*OFFSET_INNER_MID, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true); } else if(g_settings.channellist_foot == 0) { transponder t; @@ -1790,7 +1790,7 @@ void CChannelList::paintButtonBar(bool is_current) //manage record button if (g_settings.recording_type == RECORDING_OFF) continue; - if (IS_WEBTV(channel_id)) + if (IS_WEBCHAN(channel_id)) continue; if (!displayNext){ if (do_record){ @@ -1808,7 +1808,7 @@ void CChannelList::paintButtonBar(bool is_current) if (i == 5) { //manage pip button #ifdef ENABLE_PIP - if (!is_current || IS_WEBTV(channel_id)) + if (!is_current || IS_WEBCHAN(channel_id)) #endif continue; } @@ -2247,7 +2247,7 @@ bool CChannelList::SameTP(t_channel_id channel_id) bool iscurrent = true; if(CNeutrinoApp::getInstance()->recordingstatus) { - if (IS_WEBTV(channel_id)) + if (IS_WEBCHAN(channel_id)) return true; CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); @@ -2267,7 +2267,7 @@ bool CChannelList::SameTP(CZapitChannel * channel) if(channel == NULL) channel = (*chanlist)[selected]; - if (IS_WEBTV(channel->getChannelID())) + if (IS_WEBCHAN(channel->getChannelID())) return true; iscurrent = CFEManager::getInstance()->canTune(channel); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index e86c77288..aef224b34 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -522,7 +522,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna doRecord = (ShowMsg(LOCALE_RECORDING_ALREADY_FOUND_CHECK, message, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo) == CMsgBox::mbrYes); } } - t_channel_id used_id = IS_WEBTV(channel_id) ? channel_id : evtlist[selected].channelID; + t_channel_id used_id = IS_WEBCHAN(channel_id) ? channel_id : evtlist[selected].channelID; if (!recDir.empty() && doRecord) //add/remove recording timer events and check/warn for conflicts { CFollowScreenings m(used_id, @@ -551,7 +551,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna continue; } - g_Timerd->addZaptoTimerEvent(IS_WEBTV(channel_id) ? channel_id : evtlist[selected].channelID, + g_Timerd->addZaptoTimerEvent(IS_WEBCHAN(channel_id) ? channel_id : evtlist[selected].channelID, evtlist[selected].startTime - (g_settings.zapto_pre_time * 60), evtlist[selected].startTime - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0, evtlist[selected].eventID, evtlist[selected].startTime, 0); diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 5e88987d9..7873af7cd 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -795,7 +795,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap if (g_settings.infobar_sat_display) { // TODO split into WebTV/WebRadio - std::string name = (IS_WEBTV(current_channel_id))? "Web-Channel" : CServiceManager::getInstance()->GetSatelliteName(satellitePosition); + std::string name = (IS_WEBCHAN(current_channel_id))? "Web-Channel" : CServiceManager::getInstance()->GetSatelliteName(satellitePosition); int satNameWidth = g_SignalFont->getRenderWidth (name); std::string satname_tmp = name; if (satNameWidth > (ChanWidth - numbox_offset*2)) { @@ -882,7 +882,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap if (fileplay) { show_Data (); #if 0 - } else if (IS_WEBTV(new_channel_id)) { + } else if (IS_WEBCHAN(new_channel_id)) { if (channel) { const char *current = channel->getDesc().c_str(); const char *next = channel->getUrl().c_str(); @@ -1491,7 +1491,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) int duration = CMoviePlayerGui::getInstance().GetDuration(); snprintf(runningRest, sizeof(runningRest), "%d / %d %s", (curr_pos + 30000) / 60000, (duration - curr_pos + 30000) / 60000, unit_short_minute); display_Info(NULL, NULL, false, CMoviePlayerGui::getInstance().file_prozent, NULL, runningRest); - } else if (!IS_WEBTV(current_channel_id)) { + } else if (!IS_WEBCHAN(current_channel_id)) { show_Data(false); } } @@ -1597,7 +1597,7 @@ void CInfoViewer::sendNoEpg(const t_channel_id for_channel_id) void CInfoViewer::getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info) { /* to clear the oldinfo for channels without epg, call getEPG() with for_channel_id = 0 */ - if (for_channel_id == 0 || IS_WEBTV(for_channel_id)) + if (for_channel_id == 0 || IS_WEBCHAN(for_channel_id)) { oldinfo.current_uniqueKey = 0; return; @@ -1638,7 +1638,7 @@ void CInfoViewer::showSNR () int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8; /* right now, infobar_show_channellogo == 3 is the trigger for signal bars etc. TODO: decouple this */ - if (!fileplay && !IS_WEBTV(current_channel_id) && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 )) { + if (!fileplay && !IS_WEBCHAN(current_channel_id) && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 )) { int y_freq = 2*g_SignalFont->getHeight(); if (!g_settings.infobar_sat_display) y_freq -= g_SignalFont->getHeight()/2; //half line up to center freq vertically diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 9c25174a1..3759c8c8c 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -184,7 +184,7 @@ void CInfoViewerBB::getBBIconInfo() iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h); break; case CInfoViewerBB::ICON_TUNER: - if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !IS_WEBTV(g_InfoViewer->get_current_channel_id())) + if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id())) iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h); break; default: @@ -562,7 +562,7 @@ void CInfoViewerBB::showIcon_16_9() if ((g_InfoViewer->aspectRatio == 0) || ( g_RemoteControl->current_PIDs.PIDs.vpid == 0 ) || (g_InfoViewer->aspectRatio != videoDecoder->getAspectRatio())) { if (g_InfoViewer->chanready && - (g_RemoteControl->current_PIDs.PIDs.vpid > 0 || IS_WEBTV(g_InfoViewer->get_current_channel_id()))) + (g_RemoteControl->current_PIDs.PIDs.vpid > 0 || IS_WEBCHAN(g_InfoViewer->get_current_channel_id()))) g_InfoViewer->aspectRatio = videoDecoder->getAspectRatio(); else g_InfoViewer->aspectRatio = 0; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 8cec9abd0..f82010273 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1462,7 +1462,7 @@ bool CMoviePlayerGui::PlayFileStart(void) int i; int towait = (timeshift == TSHIFT_MODE_ON) ? TIMESHIFT_SECONDS+1 : TIMESHIFT_SECONDS; int cnt = 500; - if (IS_WEBTV(movie_info.channelId)) { + if (IS_WEBCHAN(movie_info.channelId)) { videoDecoder->setBlank(false); cnt = 200; towait = 20; diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 27229ec64..333cfabbb 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -540,7 +540,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) average_bitrate_offset = spaceoffset; int box_width2 = box_width-(spaceoffset+xpos); - if((channel->getVideoPid() || IS_WEBTV(channel->getChannelID())) && !(videoDecoder->getBlank())){ + if((channel->getVideoPid() || IS_WEBCHAN(channel->getChannelID())) && !(videoDecoder->getBlank())){ videoDecoder->getPictureInfo(xres, yres, framerate); if (yres == 1088) yres = 1080; @@ -748,7 +748,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) g_Font[font_info]->RenderString(xpos, ypos, box_width, buf, COL_MENUCONTENT_TEXT); // TODO: split info WebTV/WebRadio - snprintf(buf, sizeof(buf), "%s", IS_WEBTV(channel->getChannelID()) ? "Web-Channel" : + snprintf(buf, sizeof(buf), "%s", IS_WEBCHAN(channel->getChannelID()) ? "Web-Channel" : CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition()).c_str()); g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width2, buf, COL_MENUCONTENT_TEXT); diff --git a/src/gui/webtv_setup.cpp b/src/gui/webtv_setup.cpp index 9e0edf26f..b110419e9 100644 --- a/src/gui/webtv_setup.cpp +++ b/src/gui/webtv_setup.cpp @@ -201,7 +201,7 @@ int CWebTVResolution::Show() (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()); if (oldRes != g_settings.livestreamResolution && _mode_webtv) { CZapitChannel * cc = CZapit::getInstance()->GetCurrentChannel(); - if (cc && IS_WEBTV(cc->getChannelID())) { + if (cc && IS_WEBCHAN(cc->getChannelID())) { CMoviePlayerGui::getInstance().stopPlayBack(); CMoviePlayerGui::getInstance().PlayBackgroundStart(cc->getUrl(), cc->getName(), cc->getChannelID(), cc->getScriptName()); } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 1e9e87590..384d5256d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2049,7 +2049,7 @@ void CNeutrinoApp::InitZapper() tuxtxt_init(); t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); - if(channelList->getSize() && live_channel_id && !IS_WEBTV(live_channel_id)) + if(channelList->getSize() && live_channel_id && !IS_WEBCHAN(live_channel_id)) g_Sectionsd->setServiceChanged(live_channel_id, false); } @@ -3699,7 +3699,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) mode=mode_webradio; if ((data & norezap) != norezap) { CZapitChannel * cc = CZapit::getInstance()->GetCurrentChannel(); - if (cc && IS_WEBTV(cc->getChannelID())) { + if (cc && IS_WEBCHAN(cc->getChannelID())) { CMoviePlayerGui::getInstance().stopPlayBack(); if (!CMoviePlayerGui::getInstance().PlayBackgroundStart(cc->getUrl(), cc->getName(), cc->getChannelID(), cc->getScriptName())) g_RCInput->postMsg(NeutrinoMessages::EVT_ZAP_FAILED, data); diff --git a/src/zapit/include/zapit/types.h b/src/zapit/include/zapit/types.h index 860d748bb..efdd5a166 100644 --- a/src/zapit/include/zapit/types.h +++ b/src/zapit/include/zapit/types.h @@ -80,7 +80,7 @@ static inline t_channel_id create_channel_id64(t_service_id service_id, t_origin } #define CREATE_CHANNEL_ID64 create_channel_id64(service_id, original_network_id, transport_stream_id, satellitePosition, freq) -static inline bool IS_WEBTV(t_channel_id cid) +static inline bool IS_WEBCHAN(t_channel_id cid) { return (cid & 0xFFFFFFFF00000000) == 0xFFFFFFFF00000000; } diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index aae38bc03..3662b3a20 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -207,7 +207,7 @@ void CCamManager::StopCam(t_channel_id channel_id, CCam *cam) bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start, bool force_update) { - if (IS_WEBTV(channel_id)) + if (IS_WEBCHAN(channel_id)) return false; CCam * cam; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index b83be82c6..78bd0f345 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -521,14 +521,14 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay /* firstzap right now does nothing but control saving the audio channel */ firstzap = false; - if (IS_WEBTV(newchannel->getChannelID()) && !newchannel->getUrl().empty()) { + if (IS_WEBCHAN(newchannel->getChannelID()) && !newchannel->getUrl().empty()) { dvbsub_stop(); if (current_channel && current_channel->getChannelID() == newchannel->getChannelID() && !newchannel->getScriptName().empty()){ INFO("[zapit] stop rezap to channel %s id %" PRIx64 ")", newchannel->getName().c_str(), newchannel->getChannelID()); return true; } - if (!IS_WEBTV(live_channel_id)) + if (!IS_WEBCHAN(live_channel_id)) CCamManager::getInstance()->Stop(live_channel_id, CCamManager::PLAY); live_channel_id = newchannel->getChannelID(); @@ -809,7 +809,7 @@ bool CZapit::ZapForEpg(const t_channel_id channel_id, bool instandby) /* no need to lock fe in standby mode, epg scan should care to not call this if recording running */ if (!instandby) { - if (!IS_WEBTV(live_channel_id)) + if (!IS_WEBCHAN(live_channel_id)) CFEManager::getInstance()->lockFrontend(live_fe); #ifdef ENABLE_PIP if (pip_fe /* && pip_fe != live_fe */) @@ -819,7 +819,7 @@ bool CZapit::ZapForEpg(const t_channel_id channel_id, bool instandby) CFrontend * frontend = CFEManager::getInstance()->allocateFE(newchannel); if (!instandby) { - if (!IS_WEBTV(live_channel_id)) + if (!IS_WEBCHAN(live_channel_id)) CFEManager::getInstance()->unlockFrontend(live_fe); #ifdef ENABLE_PIP if (pip_fe /* && pip_fe != live_fe */) @@ -2219,7 +2219,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) return true; } #if 0 - if (IS_WEBTV(thisChannel->getChannelID())) { + if (IS_WEBCHAN(thisChannel->getChannelID())) { INFO("WEBTV channel\n"); SendEvent(CZapitClient::EVT_WEBTV_ZAP_COMPLETE, &live_channel_id, sizeof(t_channel_id)); return true; @@ -2306,7 +2306,7 @@ bool CZapit::StopPlayBack(bool send_pmt, bool blank) CCamManager::getInstance()->Stop(live_channel_id, CCamManager::PLAY); #if 0 - if (current_channel && IS_WEBTV(current_channel->getChannelID())) { + if (current_channel && IS_WEBCHAN(current_channel->getChannelID())) { playing = false; return true; } @@ -2388,7 +2388,7 @@ void CZapit::leaveStandby(void) if (current_channel) { /* tune channel, with stopped playback to not bypass the parental PIN check */ ZapIt(live_channel_id, false, false); - if (IS_WEBTV(live_channel_id)) { + if (IS_WEBCHAN(live_channel_id)) { CZapitChannel* newchannel = CServiceManager::getInstance()->FindChannel(last_channel_id); CFrontend * fe = newchannel ? CFEManager::getInstance()->allocateFE(newchannel) : NULL; bool transponder_change;