git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix keymap associations with INFO button
[enigma2.git]
/
lib
/
nav
/
core.h
diff --git
a/lib/nav/core.h
b/lib/nav/core.h
index 056c150bfe4de8eb4a3eb2d91963990082008a47..01efe9af284f62a4d97e52e169c51e0f46b408dd 100644
(file)
--- a/
lib/nav/core.h
+++ b/
lib/nav/core.h
@@
-4,30
+4,33
@@
#include <lib/base/object.h>
#include <lib/service/iservice.h>
#include <connection.h>
#include <lib/base/object.h>
#include <lib/service/iservice.h>
#include <connection.h>
+#include <map>
class eNavigation: public iObject, public Object
{
class eNavigation: public iObject, public Object
{
- DECLARE_REF;
-private:
- ePtr<iPlayableService> m_runningService;
+ DECLARE_REF(eNavigation);
ePtr<iServiceHandler> m_servicehandler;
ePtr<iServiceHandler> m_servicehandler;
- Signal2<void,eNavigation*,int> m_event;
+
+ ePtr<iPlayableService> m_runningService;
+ Signal1<void,int> m_event;
ePtr<eConnection> m_service_event_conn;
void serviceEvent(iPlayableService* service, int event);
ePtr<eConnection> m_service_event_conn;
void serviceEvent(iPlayableService* service, int event);
-
- std::list<eServiceReference> m_playlist;
+
+ std::map<ePtr<iRecordableService>, ePtr<eConnection>, std::less<iRecordableService*> > m_recordings;
+ Signal2<void,ePtr<iRecordableService>,int> m_record_event;
+ void recordEvent(iRecordableService* service, int event);
public:
public:
- enum
- {
- evNewService,
- evPlayFailed,
- evPlaylistDone
- };
+
RESULT playService(const eServiceReference &service);
RESULT playService(const eServiceReference &service);
- RESULT
enqueueService(const eServiceReference &service
);
- RESULT connect
Event(const Slot2<void,eNavigation*
,int> &event, ePtr<eConnection> &connection);
+ RESULT
connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection
);
+ RESULT connect
RecordEvent(const Slot2<void,ePtr<iRecordableService>
,int> &event, ePtr<eConnection> &connection);
/* int connectServiceEvent(const Slot1<void,iPlayableService*,int> &event, ePtr<eConnection> &connection); */
RESULT getCurrentService(ePtr<iPlayableService> &service);
/* int connectServiceEvent(const Slot1<void,iPlayableService*,int> &event, ePtr<eConnection> &connection); */
RESULT getCurrentService(ePtr<iPlayableService> &service);
+ RESULT stopService(void);
+
+ RESULT recordService(const eServiceReference &ref, ePtr<iRecordableService> &service);
+ RESULT stopRecordService(ePtr<iRecordableService> &service);
+ PyObject *getRecordings(void);
RESULT pause(int p);
eNavigation(iServiceHandler *serviceHandler);
RESULT pause(int p);
eNavigation(iServiceHandler *serviceHandler);