Merge branch 'master', remote-tracking branch 'origin' into dvbsi++

This commit is contained in:
[CST] Focus
2012-03-02 19:31:49 +04:00
16 changed files with 257 additions and 186 deletions

View File

@@ -111,6 +111,8 @@ class CInfoViewer
char old_timestr[10];
static const short bar_width = 72;
static event_id_t last_curr_id, last_next_id;
uint64_t timeoutEnd;
void setInfobarTimeout(int timeout_ext = 0);
CChannelEventList evtlist;
CChannelEventList::iterator eli;