projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'obi/master-20110329' into experimental
[vuplus_dvbapp]
/
lib
/
dvb
/
dvb.h
diff --git
a/lib/dvb/dvb.h
b/lib/dvb/dvb.h
index
9277160
..
3349014
100644
(file)
--- a/
lib/dvb/dvb.h
+++ b/
lib/dvb/dvb.h
@@
-135,7
+135,7
@@
class eDVBResourceManager: public iObject, public Object
DECLARE_REF(eDVBResourceManager);
int avail, busy;
DECLARE_REF(eDVBResourceManager);
int avail, busy;
- enum { DM7025, DM800, DM500HD, DM800SE, DM8000 };
+ enum { DM7025, DM800, DM500HD, DM800SE, DM8000
, DM7020HD
};
int m_boxtype;
int m_boxtype;
@@
-260,7
+260,7
@@
public:
RESULT playFile(const char *file);
void stopFile();
RESULT playFile(const char *file);
void stopFile();
- RESULT playSource(ePtr<i
Data
Source>& source, const char *priv=NULL);
+ RESULT playSource(ePtr<i
Ts
Source>& source, const char *priv=NULL);
void stopSource();
void setCueSheet(eCueSheet *cuesheet);
void stopSource();
void setCueSheet(eCueSheet *cuesheet);