Merge branch 'bug_124_m2ts_support'

[enigma2.git] / lib / nav / pcore.h

diff --git a/lib/nav/pcore.h b/lib/nav/pcore.h
index d2e98b79d9ca906b9efa691c1653d57bcb480f9d..c157e0dcc43f449902be4564b5ebe07fc9e1bbe2 100644 (file)
--- a/lib/nav/pcore.h
+++ b/lib/nav/pcore.h
@@ -8,33 +8,27 @@
 
 class pNavigation: public iObject, public Object
 {
-DECLARE_REF(pNavigation);
+       DECLARE_REF(pNavigation);
 public:
        PSignal1<void, int> m_event;
-       
-       enum
-       {
-               evStopService,  /** the "current" service was just stopped and likes to be deallocated (clear refs!) */
-               evNewService,   /** a new "current" service was just started */
-               evPlayFailed,   /** the next service (in playlist) or the one given in playService failed to play */
-               evPlaylistDone, /** the last service in the playlist was just played */
-               evUpdatedEventInfo /** the "currently running" event info was updated */
-       };
-       
+       PSignal2<void, ePtr<iRecordableService>&, int> m_record_event;
+
        pNavigation();
        
        RESULT playService(const eServiceReference &service);
-       RESULT recordService(const eServiceReference &ref, ePtr<iRecordableService> &service);
-       
-       RESULT enqueueService(const eServiceReference &service);
-       SWIG_VOID(RESULT) getCurrentService(ePtr<iPlayableService> &SWIG_OUTPUT);
-       SWIG_VOID(RESULT) getPlaylist(ePtr<ePlaylist> &SWIG_OUTPUT);
-       
+       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;
-       void navEvent(eNavigation *nav, int event);
+       ePtr<eConnection> m_nav_event_connection, m_nav_record_event_connection;
+       void navEvent(int event);
+       void navRecordEvent(ePtr<iRecordableService>, int event);
 };
 
 #endif