Merge branch 'master' of git.opendreambox.org:/git/enigma2

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

diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
index a6ed35f66480b99808ecb0afb697ce6dae672137..264817ce0a06d9ae45acae070fa3a417ec194bcf 100644 (file)
--- a/lib/nav/pcore.cpp
+++ b/lib/nav/pcore.cpp
@@ -10,7 +10,7 @@ pNavigation::pNavigation()
        ePtr<iServiceHandler> service_center;
        eServiceCenter::getInstance(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 = new eNavigation(service_center);
        
        m_core->connectEvent(slot(*this, &pNavigation::navEvent), m_nav_event_connection);


@@ -37,9 +37,9 @@ RESULT pNavigation::stopService()
        return m_core->stopService();
 }
 
        return m_core->stopService();
 }
 

-RESULT pNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service)
+RESULT pNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service, bool simulate)

 {
 {

-       return m_core->recordService(ref, service);
+       return m_core->recordService(ref, service, simulate);

 }
 
 RESULT pNavigation::stopRecordService(ePtr<iRecordableService> &service)
 }
 
 RESULT pNavigation::stopRecordService(ePtr<iRecordableService> &service)


@@ -47,9 +47,9 @@ RESULT pNavigation::stopRecordService(ePtr<iRecordableService> &service)
        return m_core->stopRecordService(service);
 }
 
        return m_core->stopRecordService(service);
 }
 

-PyObject *pNavigation::getRecordings(void)
+PyObject *pNavigation::getRecordings(bool simulate)

 {
 {

-       return m_core->getRecordings();
+       return m_core->getRecordings(simulate);

 }
 
 void pNavigation::navEvent(int event)
 }
 
 void pNavigation::navEvent(int event)