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

use CEitManager to get EIT data

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74a761ef50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-08-30 11:40:02 +04:00
parent 579e7a92f4
commit 5580b9cc18
15 changed files with 76 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/daemonc/remotecontrol.cpp
View File

@@ -48,6 +48,7 @@
#include <zapit/bouquets.h>
#include <zapit/zapit.h>
#include <zapit/getservices.h>
#include <eitd/sectionsd.h>
#define ZAP_GUARD_TIME 2000 // ms
@@ -55,11 +56,6 @@ extern CBouquetManager *g_bouquetManager;
extern uint32_t scrambled_timer;
bool sectionsd_getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags);
bool sectionsd_getLinkageDescriptorsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors);
bool sectionsd_getNVODTimesServiceKey(const t_channel_id uniqueServiceKey, CSectionsdClient::NVODTimesList& nvod_list);
void sectionsd_setPrivatePid(unsigned short pid);
CSubService::CSubService(const t_original_network_id anoriginal_network_id, const t_service_id aservice_id, const t_transport_stream_id atransport_stream_id, const std::string &asubservice_name)
{
service.original_network_id = anoriginal_network_id;
@@ -293,8 +289,6 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
{
CVFD::getInstance()->showServicename(current_channel_name); // UTF-8
g_Zapit->getPIDS( current_PIDs );
//g_Sectionsd->setPrivatePid( current_PIDs.PIDs.privatepid );
sectionsd_setPrivatePid( current_PIDs.PIDs.privatepid );
//tuxtxt
#if 1
tuxtxt_stop();
@@ -369,8 +363,7 @@ void CRemoteControl::getSubChannels()
if ( subChannels.empty() )
{
CSectionsdClient::LinkageDescriptorList linkedServices;
//if ( g_Sectionsd->getLinkageDescriptorsUniqueKey( current_EPGid, linkedServices ) )
if ( sectionsd_getLinkageDescriptorsUniqueKey( current_EPGid, linkedServices ) )
if (CEitManager::getInstance()->getLinkageDescriptorsUniqueKey( current_EPGid, linkedServices))
{
if ( linkedServices.size()> 1 )
{
@@ -403,8 +396,7 @@ void CRemoteControl::getNVODs()
if ( subChannels.empty() )
{
CSectionsdClient::NVODTimesList NVODs;
//if ( g_Sectionsd->getNVODTimesServiceKey( current_channel_id & 0xFFFFFFFFFFFFULL, NVODs ) )
if ( sectionsd_getNVODTimesServiceKey( current_channel_id & 0xFFFFFFFFFFFFULL, NVODs ) )
if (CEitManager::getInstance()->getNVODTimesServiceKey( current_channel_id & 0xFFFFFFFFFFFFULL, NVODs))
{
are_subchannels = false;
//printf("CRemoteControl::getNVODs NVODs.size %d\n", NVODs.size());
@@ -534,8 +526,7 @@ void CRemoteControl::processAPIDnames()
if ( current_EPGid != 0 )
{
CSectionsdClient::ComponentTagList tags;
//if ( g_Sectionsd->getComponentTagsUniqueKey( current_EPGid, tags ) )
if ( sectionsd_getComponentTagsUniqueKey( current_EPGid, tags ) )
if (CEitManager::getInstance()->getComponentTagsUniqueKey(current_EPGid, tags))
{
has_unresolved_ctags = false;