Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2012-09-26 17:52:47 +08:00
15 changed files with 163 additions and 91 deletions

View File

@@ -14,6 +14,10 @@
class cRecordData;
#define REC_STATUS_OK 0
#define REC_STATUS_SLOW 1
#define REC_STATUS_OVERFLOW 2
class cRecord {
private:
cRecordData * rd;
@@ -29,6 +33,8 @@ public:
bool Start(int fd, unsigned short vpid, unsigned short * apids, int numapids, uint64_t chid);
bool Stop(void);
bool AddPid(unsigned short pid);
int GetStatus();
void ResetStatus();
};
#endif // __RECORD_CS_H_