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

add pseudo AdZap timertype

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c7968edc4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-07 (Fri, 07 Feb 2014)

Origin message was:
------------------
-add pseudo AdZap timertype

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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2014-02-07 18:05:06 +01:00
parent 4da4b1a7fd
commit 02dd8b38cb
5 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/epgview.cpp
View File

@@ -784,17 +784,24 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
break;
case CRCInput::RC_page_up:
if(isCurrentEPG(channel_id)){
g_settings.wzap_time++;
if(g_settings.wzap_time>9)
g_settings.wzap_time = 9;
if(g_settings.wzap_time> 14)
g_settings.wzap_time+=5;
else
g_settings.wzap_time++;
if(g_settings.wzap_time>60)
g_settings.wzap_time = 0;
showTimerEventBar(true, true);
}
break;
case CRCInput::RC_page_down:
if(isCurrentEPG(channel_id)){
g_settings.wzap_time--;
if(g_settings.wzap_time> 19)
g_settings.wzap_time-=5;
else
g_settings.wzap_time--;
if(g_settings.wzap_time<0)
g_settings.wzap_time = 0;
g_settings.wzap_time = 60;
showTimerEventBar(true, true);
}
break;
@@ -886,11 +893,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
//CTimerdClient timerdclient;
if (g_Timerd->isTimerdAvailable())
{
if(g_settings.wzap_time && isCurrentEPG(channel_id)){
g_Timerd->addZaptoTimerEvent(channel_id,
time (NULL) + (g_settings.wzap_time * 60),
0, 0,
0, 0, 0);
if(!g_Timerd->adzap_eventID && g_settings.wzap_time && isCurrentEPG(channel_id)){
g_Timerd->addAdZaptoTimerEvent(channel_id,
time (NULL) + (g_settings.wzap_time * 60));
loop = false;
}else{
g_Timerd->addZaptoTimerEvent(channel_id,
epgData.epg_times.startzeit - (g_settings.zapto_pre_time * 60),
@@ -1183,7 +1189,7 @@ void CEpgData::showTimerEventBar (bool pshow, bool webzap)
/* 2 * ICON_LARGE_WIDTH for potential 16:9 and DD icons */
int aw = ox - 20 - 2 * (ICON_LARGE_WIDTH + 2);
std::string tmp_but_name;
if(g_settings.wzap_time && webzap){
if(g_settings.wzap_time && webzap && !g_Timerd->adzap_eventID){
tmp_but_name = g_Locale->getText(LOCALE_ADZAP);
tmp_but_name += " "+ to_string(g_settings.wzap_time) + " ";
tmp_but_name += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);