X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fnav%2Fpcore.cpp;h=264817ce0a06d9ae45acae070fa3a417ec194bcf;hb=a8d75296d6619328f08748e987ce39e1028b0e15;hp=7b61ce5c4d67a0f85305692408141acac4875df1;hpb=e677ac4a7bf81391877c909a703e5918ce4a511b;p=vuplus_dvbapp

diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
index 7b61ce5..264817c 100644
--- a/lib/nav/pcore.cpp
+++ b/lib/nav/pcore.cpp
@@ -1,15 +1,20 @@
 #include <lib/nav/pcore.h>
 #include <lib/service/service.h>
+#include <lib/service/event.h>
+#include <lib/base/eerror.h>
 
 DEFINE_REF(pNavigation);
 
 pNavigation::pNavigation()
 {
-	ePtr<eServiceCenter> service_center;
+	ePtr<iServiceHandler> service_center;
 	eServiceCenter::getInstance(service_center);
 
-	assert(service_center);
+	ASSERT(service_center);
 	m_core = new eNavigation(service_center);
+	
+	m_core->connectEvent(slot(*this, &pNavigation::navEvent), m_nav_event_connection);
+	m_core->connectRecordEvent(slot(*this, &pNavigation::navRecordEvent), m_nav_record_event_connection);
 }
 
 RESULT pNavigation::playService(const eServiceReference &service)
@@ -17,22 +22,44 @@ RESULT pNavigation::playService(const eServiceReference &service)
 	return m_core->playService(service);
 }
 
-RESULT pNavigation::enqueueService(const eServiceReference &service)
+RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
 {
-	return m_core->enqueueService(service);
+	return m_core->getCurrentService(service);
 }
 
-RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
+RESULT pNavigation::pause(int p)
 {
-	return m_core->getCurrentService(service);
+	return m_core->pause(p);
 }
 
-RESULT pNavigation::getPlaylist(ePtr<ePlaylist> &playlist)
+RESULT pNavigation::stopService()
 {
-	return m_core->getPlaylist(playlist);
+	return m_core->stopService();
 }
 
-RESULT pNavigation::pause(int p)
+RESULT pNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service, bool simulate)
 {
-	return m_core->pause(p);
+	return m_core->recordService(ref, service, simulate);
+}
+
+RESULT pNavigation::stopRecordService(ePtr<iRecordableService> &service)
+{
+	return m_core->stopRecordService(service);
+}
+
+PyObject *pNavigation::getRecordings(bool simulate)
+{
+	return m_core->getRecordings(simulate);
+}
+
+void pNavigation::navEvent(int event)
+{
+		/* just relay the events here. */
+	m_event(event);
+}
+
+void pNavigation::navRecordEvent(ePtr<iRecordableService> service, int event)
+{
+		/* just relay the events here. */
+	m_record_event(service, event);
 }