swap green and red led

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

diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
index 3dbe71068044e34f6a41ac886a4d5b736086dcf4..264817ce0a06d9ae45acae070fa3a417ec194bcf 100644 (file)
--- a/lib/nav/pcore.cpp
+++ b/lib/nav/pcore.cpp
@@ -10,10 +10,11 @@ pNavigation::pNavigation()
        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)
@@ -21,55 +22,44 @@ RESULT pNavigation::playService(const eServiceReference &service)
        return m_core->playService(service);
 }
 
-RESULT pNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service)
+RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
 {
-       return m_core->recordService(ref, service);
+       return m_core->getCurrentService(service);
 }
 
-RESULT pNavigation::enqueueService(const eServiceReference &service)
+RESULT pNavigation::pause(int p)
 {
-       return m_core->enqueueService(service);
+       return m_core->pause(p);
 }
 
-RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
+RESULT pNavigation::stopService()
 {
-       return m_core->getCurrentService(service);
+       return m_core->stopService();
 }
 
-RESULT pNavigation::getPlaylist(ePtr<ePlaylist> &playlist)
+RESULT pNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service, bool simulate)
 {
-       return m_core->getPlaylist(playlist);
+       return m_core->recordService(ref, service, simulate);
 }
 
-RESULT pNavigation::pause(int p)
+RESULT pNavigation::stopRecordService(ePtr<iRecordableService> &service)
 {
-       return m_core->pause(p);
+       return m_core->stopRecordService(service);
 }
 
-RESULT pNavigation::stopService()
+PyObject *pNavigation::getRecordings(bool simulate)
 {
-       return m_core->stopService();
+       return m_core->getRecordings(simulate);
+}
+
+void pNavigation::navEvent(int event)
+{
+               /* just relay the events here. */
+       m_event(event);
 }
 
-void pNavigation::navEvent(eNavigation *nav, int event)
+void pNavigation::navRecordEvent(ePtr<iRecordableService> service, int event)
 {
                /* just relay the events here. */
-       switch (event)
-       {
-       case eNavigation::evStopService:
-               m_event(evStopService);
-               break;
-       case eNavigation::evNewService:
-               m_event(evNewService);
-               break;
-       case eNavigation::evPlayFailed:
-               m_event(evPlayFailed);
-               break;
-       case eNavigation::evPlaylistDone:
-               m_event(evPlaylistDone);
-               break;
-       case eNavigation::evUpdatedEventInfo:
-               m_event(evUpdatedEventInfo);
-               break;
-       }
+       m_record_event(service, event);
 }