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

Origin commit data
------------------
Branch: ni/coolstream
Commit: e9430aec0d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 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-02-19 13:20:19 +04:00
46 changed files with 392 additions and 150 deletions

View File

@@ -216,5 +216,6 @@ class CRecordManager : public CMenuTarget, public CChangeObserver
bool IsTimeshift(t_channel_id channel_id=0);
void StartTimeshift();
int GetRecordMode(const t_channel_id channel_id=0);
bool IsFileRecord(std::string file);
};
#endif