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

Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup

Browse Source
This commit is contained in:
[CST] Bas
2012-03-06 12:51:31 +08:00
parent a4ff0a99fe 289bf2c4b2
commit 2142970a35
101 changed files with 15114 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -1883,9 +1883,8 @@ void CControlAPI::SendTimersXML(CyhookHandler *hh)
// epg title
std::string title = timer->epgTitle;
if(timer->epgID!=0) {
CSectionsdClient sdc;
CEPGData epgdata;
if (sdc.getEPGid(timer->epgID, timer->epg_starttime, &epgdata))
if (sectionsd_getEPGid(timer->epgID, timer->epg_starttime, &epgdata))
title = epgdata.title;
}

27
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
View File

@@ -35,7 +35,7 @@
#include <dmx.h>
#include <zapit/satconfig.h>
#include <zapit/client/zapitclient.h>
#include <zapit/channel.h>
#include <zapit/zapit.h>
#include <zapit/bouquets.h>
#include <zapit/getservices.h>
@@ -183,7 +183,7 @@ void CNeutrinoAPI::ZapToChannelId(t_channel_id channel_id)
}
if (Zapit->zapTo_serviceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM)
Sectionsd->setServiceChanged(channel_id&0xFFFFFFFFFFFFULL, false);
Sectionsd->setServiceChanged(channel_id, false);
}
//-------------------------------------------------------------------------
@@ -196,7 +196,7 @@ void CNeutrinoAPI::ZapToSubService(const char * const target)
&channel_id);
if (Zapit->zapTo_subServiceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM)
Sectionsd->setServiceChanged(channel_id&0xFFFFFFFFFFFFULL, false);
Sectionsd->setServiceChanged(channel_id, false);
}
//-------------------------------------------------------------------------
t_channel_id CNeutrinoAPI::ChannelNameToChannelId(std::string search_channel_name)
@@ -457,15 +457,20 @@ std::string CNeutrinoAPI::getAudioInfoAsString(void) {
//-------------------------------------------------------------------------
std::string CNeutrinoAPI::getCryptInfoAsString(void) {
extern int pmt_caids[4][11];
unsigned short i,j;
unsigned short i;
std::stringstream out;
std::string casys[11]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
for(i=0;i<4;i++){
for(j=0;j<11;j++){
if(pmt_caids[i][j]){
out << casys[j] << hex << pmt_caids[i][j]<< "\n";
}
std::string casys[11]= {"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
int caids[] = { 0x600, 0x1700, 0x0100, 0x0500, 0x1800, 0xB00, 0xD00, 0x900, 0x2600, 0x4a00, 0x0E00 };
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
if(channel) {
for (i = 0; i < 11; i++) {
for(casys_map_iterator_t it = channel->camap.begin(); it != channel->camap.end(); ++it) {
int caid = (*it) & 0xFF00;
if(caid == caids[i])
out << casys[i] << hex << (*it) << "\n";
}
}
}
return out.str();

4
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -38,6 +38,7 @@ bool sectionsd_getNVODTimesServiceKey(const t_channel_id uniqueServiceKey, CSect
void sectionsd_getCurrentNextServiceKey(t_channel_id uniqueServiceKey, CSectionsdClient::responseGetCurrentNextInfoChannelID& current_next );
bool sectionsd_getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags);
bool sectionsd_getActualEPGServiceKey(const t_channel_id uniqueServiceKey, CEPGData * epgdata);
bool sectionsd_getEPGid(const event_id_t epgID, const time_t startzeit, CEPGData * epgdata);
//=============================================================================
// Constructor & Destructor & Initialization
//=============================================================================
@@ -808,9 +809,8 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler *, std::string
}
if(timer->epgID!=0)
{
CSectionsdClient sdc;
CEPGData epgdata;
if (sdc.getEPGid(timer->epgID, timer->epg_starttime, &epgdata))
if (sectionsd_getEPGid(timer->epgID, timer->epg_starttime, &epgdata))
sAddData+="<br/>" + epgdata.title;
else
sAddData+=std::string("<br/>")+timer->epgTitle;