mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/infoviewer.cpp: disable EVT_NOEPG_YET in virtual zap mode

Browse Source
This commit is contained in:
[CST] Focus
2013-07-30 10:16:18 +04:00
parent 291a990be3
commit bbe63318b8
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/infoviewer.cpp
View File

@@ -1367,6 +1367,15 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
return messages_return::unhandled; return messages_return::unhandled;
} }
void CInfoViewer::sendNoEpg(const t_channel_id channel_id)
{
if (!virtual_zap_mode) {
char *p = new char[sizeof(t_channel_id)];
memcpy(p, &channel_id, sizeof(t_channel_id));
g_RCInput->postMsg (NeutrinoMessages::EVT_NOEPG_YET, (const neutrino_msg_data_t) p, false);
}
}
CSectionsdClient::CurrentNextInfo CInfoViewer::getEPG (const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info) CSectionsdClient::CurrentNextInfo CInfoViewer::getEPG (const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info)
{ {
CEitManager::getInstance()->getCurrentNextServiceKey(for_channel_id, info); CEitManager::getInstance()->getCurrentNextServiceKey(for_channel_id, info);
@@ -1375,10 +1384,8 @@ CSectionsdClient::CurrentNextInfo CInfoViewer::getEPG (const t_channel_id for_ch
/* of there is no EPG, send an event so that parental lock can work */ /* of there is no EPG, send an event so that parental lock can work */
if (info.current_uniqueKey == 0 && info.next_uniqueKey == 0) { if (info.current_uniqueKey == 0 && info.next_uniqueKey == 0) {
sendNoEpg(for_channel_id);
oldinfo = info; oldinfo = info;
char *p = new char[sizeof(t_channel_id)];
memcpy(p, &for_channel_id, sizeof(t_channel_id));
g_RCInput->postMsg (NeutrinoMessages::EVT_NOEPG_YET, (const neutrino_msg_data_t) p, false);
return info; return info;
} }
@@ -1393,9 +1400,7 @@ CSectionsdClient::CurrentNextInfo CInfoViewer::getEPG (const t_channel_id for_ch
msg = NeutrinoMessages::EVT_NEXTEPG; msg = NeutrinoMessages::EVT_NEXTEPG;
g_RCInput->postMsg(msg, (unsigned) _info, false ); g_RCInput->postMsg(msg, (unsigned) _info, false );
} else { } else {
char *p = new char[sizeof(t_channel_id)]; sendNoEpg(for_channel_id);
memcpy(p, &for_channel_id, sizeof(t_channel_id));
g_RCInput->postMsg (NeutrinoMessages::EVT_NOEPG_YET, (const neutrino_msg_data_t) p, false); // data is pointer to allocated memory
} }
oldinfo = info; oldinfo = info;
} }
@@ -1699,12 +1704,10 @@ void CInfoViewer::show_Data (bool calledFromEvent)
// no EPG available // no EPG available
display_Info(g_Locale->getText(gotTime ? LOCALE_INFOVIEWER_NOEPG : LOCALE_INFOVIEWER_WAITTIME), NULL); display_Info(g_Locale->getText(gotTime ? LOCALE_INFOVIEWER_NOEPG : LOCALE_INFOVIEWER_WAITTIME), NULL);
/* send message. Parental pin check gets triggered on EPG events... */ /* send message. Parental pin check gets triggered on EPG events... */
char *p = new char[sizeof(t_channel_id)];
memmove(p, &channel_id, sizeof(t_channel_id));
/* clear old info in getEPG */ /* clear old info in getEPG */
CSectionsdClient::CurrentNextInfo dummy; CSectionsdClient::CurrentNextInfo dummy;
getEPG(0, dummy); getEPG(0, dummy);
g_RCInput->postMsg(NeutrinoMessages::EVT_NOEPG_YET, (const neutrino_msg_data_t)p, false); // data is pointer to allocated memory sendNoEpg(channel_id);
return; return;
} }

1
src/gui/infoviewer.h
View File

@@ -140,6 +140,7 @@ class CInfoViewer
void show_current_next(bool new_chan, int epgpos); void show_current_next(bool new_chan, int epgpos);
void reset_allScala(); void reset_allScala();
void check_channellogo_ca_SettingsChange(); void check_channellogo_ca_SettingsChange();
void sendNoEpg(const t_channel_id channel_id);
public: public:
bool chanready; bool chanready;
bool is_visible; bool is_visible;