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

show only future Screenings

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@145 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: b6a562d65c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-01-04 (Mon, 04 Jan 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-01-04 05:52:51 +00:00
parent 33dcb2d1f1
commit 8191a4f8d4
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/epgview.cpp
View File

@@ -130,11 +130,11 @@ void CEpgData::start()
/* This defines the size of the EPG window. We leave 35 pixels left and right, /* This defines the size of the EPG window. We leave 35 pixels left and right,
* 25 pixels top and bottom. It adjusts itself to the "visible screen" settings * 25 pixels top and bottom. It adjusts itself to the "visible screen" settings
*/ */
ox = w_max (1280, 70); // ox = w_max (1280, 70);
oy = h_max (720, 50 + 30); // 30 for the bottom button box. // oy = h_max (720, 50 + 30); // 30 for the bottom button box.
// ox = w_max (MAX_W * (bigFonts ? BIG_FONT_FAKTOR : 1), 0); ox = w_max ((bigFonts ? g_settings.screen_EndX : MAX_W), 70);
// oy = h_max (MAX_H * (bigFonts ? BIG_FONT_FAKTOR : 1), 0); oy = h_max ((bigFonts ? g_settings.screen_EndY : MAX_H), 50 + 30 );// 30 for the bottom button box.
sx = getScreenStartX( ox ); sx = getScreenStartX( ox );
topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight(); topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight();
@@ -906,11 +906,12 @@ void CEpgData::GetEPGData(const t_channel_id channel_id, unsigned long long id,
} }
struct tm *pStartZeit = localtime(&(epgData.epg_times).startzeit); struct tm *pStartZeit = localtime(&(epgData.epg_times).startzeit);
char temp[30]={0}; tmp_curent_zeit = (epgData.epg_times).startzeit;
int l = 0; char temp[20]={0};
l = snprintf(temp, sizeof(temp),"%s.",g_Locale->getText(CLocaleManager::getWeekday(pStartZeit))); strftime( temp, sizeof(temp),"%d.%m.%Y", pStartZeit);
strftime( temp+l, sizeof(temp)-l,"%d.%m.%Y", pStartZeit); epg_date = g_Locale->getText(CLocaleManager::getWeekday(pStartZeit));
epg_date= temp; epg_date += ".";
epg_date += temp;
strftime( temp, sizeof(temp), "%H:%M", pStartZeit); strftime( temp, sizeof(temp), "%H:%M", pStartZeit);
epg_start= temp; epg_start= temp;
@@ -980,21 +981,19 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st
{ {
CChannelEventList::iterator e; CChannelEventList::iterator e;
time_t curtime;
struct tm *tmStartZeit; struct tm *tmStartZeit;
std::string screening_dates,screening_nodual; std::string screening_dates,screening_nodual;
int count; int count;
char tmpstr[256]; char tmpstr[256]={0};
count = 0; count = 0;
screening_dates = screening_nodual = ""; screening_dates = screening_nodual = "";
// alredy read: evtlist = g_Sectionsd->getEventsServiceKey( channel_id&0xFFFFFFFFFFFFULL ); // alredy read: evtlist = g_Sectionsd->getEventsServiceKey( channel_id&0xFFFFFFFFFFFFULL );
curtime = time(NULL);
for ( e= evtlist.begin(); e != evtlist.end(); ++e ) for ( e= evtlist.begin(); e != evtlist.end(); ++e )
{ {
if (e->startTime <= curtime) continue; if (e->startTime <= tmp_curent_zeit) continue;
if (! e->eventID) continue; if (! e->eventID) continue;
if (e->description == title) { if (e->description == title) {
count++; count++;

1
src/gui/epgview.h
View File

@@ -61,6 +61,7 @@ class CEpgData
std::string epg_end; std::string epg_end;
int epg_done; int epg_done;
bool bigFonts; bool bigFonts;
time_t tmp_curent_zeit;
unsigned long long prev_id; unsigned long long prev_id;
time_t prev_zeit; time_t prev_zeit;