X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1a3bd31e5cfcba89f2db03a2b4fa550de1fa2823..3a044bea307a02147e2d01ad29f07b7348bd7203:/lib/nav/pcore.cpp

diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
index 0ee94cc6..264817ce 100644
--- 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,58 +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;
-	case eNavigation::evUpdatedInfo:
-		m_event(evUpdatedInfo);
-		break;
-	}
+	m_record_event(service, event);
 }