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

lcd4l: try to fix display of webtv-channels on external lcd; pt. 2

Browse Source 
Origin commit data
------------------
Commit: 27a925ab28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-24 (Fri, 24 Mar 2017)

Origin message was:
------------------
- lcd4l: try to fix display of webtv-channels on external lcd; pt. 2
This commit is contained in:
vanhofen
2017-03-24 21:26:21 +01:00
parent 305e497474
commit 9f24b66fed
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/lcd4l.cpp
View File

@@ -722,8 +722,14 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
if (m_ModeChannel) if (m_ModeChannel)
{ {
t_channel_id channel_id = parseID & 0xFFFFFFFFFFFFULL;
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
if (channel)
channel_id = channel->getEpgID();
CSectionsdClient::CurrentNextInfo CurrentNext; CSectionsdClient::CurrentNextInfo CurrentNext;
CEitManager::getInstance()->getCurrentNextServiceKey(parseID & 0xFFFFFFFFFFFFULL, CurrentNext); CEitManager::getInstance()->getCurrentNextServiceKey(channel_id, CurrentNext);
if (CSectionsdClient::epgflags::has_current) if (CSectionsdClient::epgflags::has_current)
{ {
@@ -907,7 +913,7 @@ uint64_t CLCD4l::GetParseID()
m_Mode = (int) ID; m_Mode = (int) ID;
m_ModeChannel = 0; m_ModeChannel = 0;
if (ID == MODE_TV || ID == MODE_RADIO) if (ID == MODE_TV || ID == MODE_WEBTV || ID == MODE_RADIO)
{ {
if (!(g_RemoteControl->subChannels.empty()) && (g_RemoteControl->selected_subchannel > 0)) if (!(g_RemoteControl->subChannels.empty()) && (g_RemoteControl->selected_subchannel > 0))
m_ModeChannel = 2; m_ModeChannel = 2;
@@ -917,11 +923,7 @@ uint64_t CLCD4l::GetParseID()
if (m_ModeChannel > 1) if (m_ModeChannel > 1)
ID = g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].getChannelID(); ID = g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].getChannelID();
else else
{ ID = CZapit::getInstance()->GetCurrentChannelID();
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
if (channel)
ID = channel->getEpgID();
}
} }
//printf("[CLCD4l] %s: %llx\n", __FUNCTION__, ID); //printf("[CLCD4l] %s: %llx\n", __FUNCTION__, ID);
return ID; return ID;

2
src/gui/lcd4l.h
View File

@@ -62,6 +62,8 @@ class CLCD4l
MODE_PIC = 6, MODE_PIC = 6,
MODE_TS = 7, MODE_TS = 7,
MODE_OFF = 8, MODE_OFF = 8,
MODE_WEBTV = 9,
MODE_UPNP = 10,
MODE_MASK = 0xFF, MODE_MASK = 0xFF,
NOREZAP = 0x100 NOREZAP = 0x100
}; };