Merge branch 'master' into multituner

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ecc60cf71
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-03-02 18:59:50 +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;