projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- add python, missing gui
[vuplus_dvbapp]
/
lib
/
service
/
iservice.h
diff --git
a/lib/service/iservice.h
b/lib/service/iservice.h
index
253f8c3
..
a636957
100644
(file)
--- a/
lib/service/iservice.h
+++ b/
lib/service/iservice.h
@@
-2,7
+2,7
@@
#define __lib_dvb_iservice_h
#include <lib/base/object.h>
#define __lib_dvb_iservice_h
#include <lib/base/object.h>
-#include <
lib/base/estring.h
>
+#include <
string
>
#include <connection.h>
#include <list>
#include <connection.h>
#include <list>
@@
-41,7
+41,7
@@
public:
inline int getSortKey() const { return (flags & hasSortKey) ? data[3] : ((flags & sort1) ? 1 : 0); }
int data[8];
inline int getSortKey() const { return (flags & hasSortKey) ? data[3] : ((flags & sort1) ? 1 : 0); }
int data[8];
-
eS
tring path;
+
std::s
tring path;
eServiceReference()
: type(idInvalid), flags(0)
eServiceReference()
: type(idInvalid), flags(0)
@@
-93,13
+93,13
@@
public:
data[3]=data3;
data[4]=data4;
}
data[3]=data3;
data[4]=data4;
}
- eServiceReference(int type, int flags, const
eS
tring &path)
+ eServiceReference(int type, int flags, const
std::s
tring &path)
: type(type), flags(flags), path(path)
{
memset(data, 0, sizeof(data));
}
: type(type), flags(flags), path(path)
{
memset(data, 0, sizeof(data));
}
- eServiceReference(const
eS
tring &string);
-
eS
tring toString() const;
+ eServiceReference(const
std::s
tring &string);
+
std::s
tring toString() const;
bool operator==(const eServiceReference &c) const
{
if (type != c.type)
bool operator==(const eServiceReference &c) const
{
if (type != c.type)
@@
-137,9
+137,11
@@
public:
class iServiceInformation: public iObject
{
public:
class iServiceInformation: public iObject
{
public:
- virtual RESULT getName(
eS
tring &name)=0;
+ virtual RESULT getName(
std::s
tring &name)=0;
};
};
+typedef ePtr<iServiceInformation> iServiceInformationPtr;
+
class iPauseableService: public iObject
{
public:
class iPauseableService: public iObject
{
public:
@@
-147,6
+149,8
@@
public:
virtual RESULT unpause()=0;
};
virtual RESULT unpause()=0;
};
+typedef ePtr<iPauseableService> iPauseableServicePtr;
+
class iPlayableService: public iObject
{
friend class iServiceHandler;
class iPlayableService: public iObject
{
friend class iServiceHandler;
@@
-163,6
+167,8
@@
public:
virtual RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr)=0;
};
virtual RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr)=0;
};
+typedef ePtr<iPlayableService> iPlayableServicePtr;
+
class iRecordableService: public iObject
{
public:
class iRecordableService: public iObject
{
public:
@@
-170,12
+176,16
@@
public:
virtual RESULT stop()=0;
};
virtual RESULT stop()=0;
};
+typedef ePtr<iRecordableService> iRecordableServicePtr;
+
class iListableService: public iObject
{
public:
virtual RESULT getContent(std::list<eServiceReference> &list)=0;
};
class iListableService: public iObject
{
public:
virtual RESULT getContent(std::list<eServiceReference> &list)=0;
};
+typedef ePtr<iListableService> iListableServicePtr;
+
class iServiceHandler: public iObject
{
public:
class iServiceHandler: public iObject
{
public:
@@
-184,4
+194,6
@@
public:
virtual RESULT list(const eServiceReference &, ePtr<iListableService> &ptr)=0;
};
virtual RESULT list(const eServiceReference &, ePtr<iListableService> &ptr)=0;
};
+typedef ePtr<iServiceHandler> iServiceHandlerPtr;
+
#endif
#endif