X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/02da1f586ef7945fef385e6d4743ef53441bc2fa..1dbaf81816d8994a84716bf1f8ca34645206ae22:/lib/nav/core.cpp

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index 9314d2c1..edc63c18 100644
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -1,4 +1,5 @@
 #include <lib/nav/core.h>
+#include <lib/base/eerror.h>
 
 void eNavigation::serviceEvent(iPlayableService* service, int event)
 {
@@ -8,35 +9,13 @@ void eNavigation::serviceEvent(iPlayableService* service, int event)
 		return;
 	}
 
-	switch (event)
-	{
-	case iPlayableService::evEnd:
-			/* at first, kill the running service */
-		m_event(this, evStopService);
-		m_runningService = 0;
-		m_service_event_conn = 0;
-			/* our running main service stopped. remove it from playlist */
-		if (!m_playlist.empty())
-			m_playlist.erase(m_playlist.begin());
-		if (!m_playlist.empty())
-		{
-			RESULT res;
-			res = playService(m_playlist.front());
-			if (res)
-				m_event(this, evPlayFailed);
-		} else
-			m_event(this, evPlaylistDone);
-		break;
-	case iPlayableService::evStart:
-		m_event(this, evNewService);
-		break;
-	default:
-		break;
-	}
+	m_event(this, event);
 }
 
 RESULT eNavigation::playService(const eServiceReference &service)
 {
+	stopService();
+	
 	assert(m_servicehandler);
 	RESULT res = m_servicehandler->play(service, m_runningService);
 	if (m_runningService)
@@ -47,15 +26,6 @@ RESULT eNavigation::playService(const eServiceReference &service)
 	return res;
 }
 
-RESULT eNavigation::enqueueService(const eServiceReference &service)
-{
-	int doplay = m_playlist.empty();
-	m_playlist.push_back(service);
-	if (doplay)
-		return playService(m_playlist.front());
-	return 0;
-}
-
 RESULT eNavigation::connectEvent(const Slot2<void,eNavigation*,int> &event, ePtr<eConnection> &connection)
 {
 	connection = new eConnection(this, m_event.connect(event));
@@ -68,12 +38,37 @@ RESULT eNavigation::getCurrentService(ePtr<iPlayableService> &service)
 	return 0;
 }
 
+RESULT eNavigation::stopService(void)
+{
+		/* check if there is a running service... */
+	if (!m_runningService)
+		return 1;
+			/* send stop event */
+	m_event(this, iPlayableService::evEnd);
+
+	m_runningService->stop();
+		/* kill service. */
+	m_runningService = 0;
+	m_service_event_conn = 0;
+	return 0;
+}
+
+RESULT eNavigation::recordService(const eServiceReference &ref, ePtr<iRecordableService> &service)
+{
+	assert(m_servicehandler);
+	RESULT res = m_servicehandler->record(ref, service);
+	eDebug("record: %d", res);
+	if (res)
+		service = 0;
+	return res;
+}
+
 RESULT eNavigation::pause(int dop)
 {
 	if (!m_runningService)
 		return -1;
 	ePtr<iPauseableService> p;
-	if (m_runningService->getIPausableService(p))
+	if (m_runningService->pause(p))
 		return -2;
 	if (dop)
 		return p->pause();
@@ -81,7 +76,7 @@ RESULT eNavigation::pause(int dop)
 		return p->unpause();
 }
 
-eNavigation::eNavigation(iServiceHandler *serviceHandler): ref(0)
+eNavigation::eNavigation(iServiceHandler *serviceHandler)
 {
 	assert(serviceHandler);
 	m_servicehandler = serviceHandler;
@@ -89,6 +84,7 @@ eNavigation::eNavigation(iServiceHandler *serviceHandler): ref(0)
 
 eNavigation::~eNavigation()
 {
+	stopService();
 }
 
 DEFINE_REF(eNavigation);