Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git] / lib / nav / pcore.h
index 3bb8f4e..c157e0d 100644 (file)
@@ -6,22 +6,29 @@
 
 /* a subset of eNavigation */
 
-class pNavigation: public iObject
+class pNavigation: public iObject, public Object
 {
-DECLARE_REF;
-private:
-       ePtr<eNavigation> m_core;
+       DECLARE_REF(pNavigation);
 public:
-       PSignal1<void, int> event;
-       
+       PSignal1<void, int> m_event;
+       PSignal2<void, ePtr<iRecordableService>&, int> m_record_event;
+
        pNavigation();
        
        RESULT playService(const eServiceReference &service);
-       RESULT enqueueService(const eServiceReference &service);
-       RESULT getCurrentService(ePtr<iPlayableService> &service);
-       RESULT getPlaylist(ePtr<ePlaylist> &playlist);
-       
+       RESULT stopService();
        RESULT pause(int p);
+       SWIG_VOID(RESULT) getCurrentService(ePtr<iPlayableService> &SWIG_OUTPUT);
+
+       SWIG_VOID(RESULT) recordService(const eServiceReference &ref, ePtr<iRecordableService> &SWIG_OUTPUT, bool simulate);
+       RESULT stopRecordService(ePtr<iRecordableService> &service);
+       PyObject *getRecordings(bool simulate=false);
+
+private:
+       ePtr<eNavigation> m_core;
+       ePtr<eConnection> m_nav_event_connection, m_nav_record_event_connection;
+       void navEvent(int event);
+       void navRecordEvent(ePtr<iRecordableService>, int event);
 };
 
 #endif