X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fnav%2Fpcore.h;h=c157e0dcc43f449902be4564b5ebe07fc9e1bbe2;hb=50157b7b9211e46eade402871d7e35142eeb04eb;hp=9e490844e43398282d619c52a21cb8478601f462;hpb=53893eb6396db5d48c105d09128baff79db4c9cc;p=vuplus_dvbapp

diff --git a/lib/nav/pcore.h b/lib/nav/pcore.h
index 9e49084..c157e0d 100644
--- 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);
-	SWIG_VOID(RESULT) recordService(const eServiceReference &ref, ePtr<iRecordableService> &SWIG_OUTPUT);
-	
-	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