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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Conflicts:
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2014-01-19 13:37:24 +01:00
parent 26efbbccf3 7b40b61c9a
commit eca8f5459b
15 changed files with 213 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/record.cpp
View File

@@ -148,7 +148,7 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
time_t msg_start_time = time(0);
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_RECORDING_START));
if (!(autoshift && g_settings.auto_timeshift))
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
hintBox.paint();
tsfile = std::string(filename) + ".ts";
@@ -255,7 +255,7 @@ bool CRecordInstance::Stop(bool remove_event)
recMovieInfo->length = (end_time - start_time + 30) / 60;
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, rec_stop_msg.c_str());
if (!(autoshift && g_settings.auto_timeshift))
if ((!(autoshift && g_settings.auto_timeshift)) && g_settings.recording_startstop_msg)
hintBox.paint();
printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id);
@@ -559,7 +559,17 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
tmpstring = "not available";
if (epgid != 0) {
CEPGData epgdata;
if (CEitManager::getInstance()->getEPGid(epgid, epg_time, &epgdata)) {
bool epg_ok = CEitManager::getInstance()->getEPGid(epgid, epg_time, &epgdata);
if(!epg_ok){//if old epgid removed check currurrent epgid
epg_ok = CEitManager::getInstance()->getActualEPGServiceKey(channel_id, &epgdata );
if(epg_ok && !epgTitle.empty()){
std::string tmp_title = epgdata.title;
if(epgTitle != tmp_title)
epg_ok = false;
}
}
if (epg_ok) {
tmpstring = epgdata.title;
info1 = epgdata.info1;
info2 = epgdata.info2;
@@ -571,6 +581,8 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
recMovieInfo->length = epgdata.epg_times.dauer / 60;
printf("fsk:%d, Genre:%d, Dauer: %d\r\n",recMovieInfo->parentalLockAge,recMovieInfo->genreMajor,recMovieInfo->length);
} else if (!epgTitle.empty()) {//if old epgid removed
tmpstring = epgTitle;
}
} else if (!epgTitle.empty()) {
tmpstring = epgTitle;