fix segfault on zap with active timeshift

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

diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
index 7b61ce5c4d67a0f85305692408141acac4875df1..a6ed35f66480b99808ecb0afb697ce6dae672137 100644 (file)
--- 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);
        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)
 {
-       return m_core->pause(p);
+       return m_core->recordService(ref, service);
+}
+
+RESULT pNavigation::stopRecordService(ePtr<iRecordableService> &service)
+{
+       return m_core->stopRecordService(service);
+}
+
+PyObject *pNavigation::getRecordings(void)
+{
+       return m_core->getRecordings();
+}
+
+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);
 }