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

Add nvodchannels to search for channel id

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1617 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-08-09 13:15:15 +00:00
parent e0ee8a723c
commit cfafa606ab
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/record.cpp
View File

@@ -64,6 +64,7 @@ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
extern t_channel_id live_channel_id;
extern t_channel_id rec_channel_id;
extern tallchans allchans;
extern tallchans nvodchannels;
bool sectionsd_getActualEPGServiceKey(const t_channel_id uniqueServiceKey, CEPGData * epgdata);
bool sectionsd_getEPGidShort(event_id_t epgID, CShortEPGData * epgdata);
@@ -221,9 +222,12 @@ bool CRecordInstance::Update()
tallchans_iterator cit = allchans.find(channel_id);
if(cit == allchans.end()) {
cit = nvodchannels.find(channel_id);
if(cit == nvodchannels.end()) {
printf("%s: channel %llx not found!\n", __FUNCTION__, channel_id);
return false;
}
}
CZapitChannel * channel = &(cit->second);
if(channel->getVideoPid() != allpids.PIDs.vpid) {
@@ -353,9 +357,12 @@ record_error_msg_t CRecordInstance::Record()
printf("%s: channel %llx recording_id %d\n", __FUNCTION__, channel_id, recording_id);
tallchans_iterator cit = allchans.find(channel_id);
if(cit == allchans.end()) {
cit = nvodchannels.find(channel_id);
if(cit == nvodchannels.end()) {
printf("%s: channel %llx not found!\n", __FUNCTION__, channel_id);
return RECORD_INVALID_CHANNEL;
}
}
CZapitChannel * channel = &(cit->second);
record_error_msg_t ret = MakeFileName(channel);
@@ -602,9 +609,13 @@ record_error_msg_t CRecordInstance::MakeFileName(CZapitChannel * channel)
void CRecordInstance::GetRecordString(std::string &str)
{
tallchans_iterator cit = allchans.find(channel_id);
if(cit == allchans.end())
if(cit == allchans.end()) {
cit = nvodchannels.find(channel_id);
if(cit == nvodchannels.end()) {
str = "Unknown channel : " + GetEpgTitle();
else
return;
}
}
str = cit->second.getName() + ": " + GetEpgTitle();
}

4
src/zapit/src/cam.cpp
View File

@@ -29,6 +29,7 @@
#include <zapit/satconfig.h>
extern tallchans allchans;
extern tallchans nvodchannels;
CCam::CCam()
{
@@ -137,9 +138,12 @@ bool CCamManager::SetMode(t_channel_id id, enum runmode mode, bool start, bool f
tallchans_iterator cit = allchans.find(id);
if(cit == allchans.end()) {
cit = nvodchannels.find(id);
if(cit == nvodchannels.end()) {
printf("CCamManager: channel %llx not found\n", id);
return false;
}
}
CZapitChannel * channel = &(cit->second);