X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1a3bd31e5cfcba89f2db03a2b4fa550de1fa2823..457ccb7da5d147837110a6be85b7f2d041e1dcba:/lib/nav/core.cpp

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index deec3739..edc63c18 100644
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -9,46 +9,7 @@ void eNavigation::serviceEvent(iPlayableService* service, int event)
 		return;
 	}
 
-	switch (event)
-	{
-	case iPlayableService::evEnd:
-		assert(m_playlist); /* we need to have a playlist */
-		
-		/* at first, kill the running service */
-		stopService();
-		
-		/* our running main service stopped. identify what to do next. */
-			
-			/* unless the playlist current position is invalid (because there was */
-			/* playlist, for example when the service was engaged with playService */
-		if (m_playlist->m_current != m_playlist->end())
-			++m_playlist->m_current;
-			
-			/* was the current service the last one? */
-		if (m_playlist->m_current == m_playlist->end())
-		{
-			m_event(this, evPlaylistDone);
-			break;
-		}
-
-			/* there is another service in the playlist. play it. */
-		RESULT res;
-		res = playService(*m_playlist->m_current);
-		if (res)
-			m_event(this, evPlayFailed);
-		break;
-	case iPlayableService::evStart:
-		m_event(this, evNewService);
-		break;
-	case iPlayableService::evUpdatedEventInfo:
-		m_event(this, evUpdatedEventInfo);
-		break;
-	case iPlayableService::evUpdatedInfo:
-		m_event(this, evUpdatedInfo);
-		break;
-	default:
-		break;
-	}
+	m_event(this, event);
 }
 
 RESULT eNavigation::playService(const eServiceReference &service)
@@ -65,25 +26,6 @@ RESULT eNavigation::playService(const eServiceReference &service)
 	return res;
 }
 
-RESULT eNavigation::enqueueService(const eServiceReference &service)
-{
-	assert(m_playlist);
-		/* check if we need to play after the service was enqueued. */
-	int doplay = m_playlist->m_current == m_playlist->end();
-	
-		/* add the service to the playlist. the playlist's m_current */
-		/* points either to a service before the last or 'doplay' is set. */
-	m_playlist->push_back(service);
-
-	if (doplay)
-	{
-		m_playlist->m_current = m_playlist->end();
-		--m_playlist->m_current;
-		return playService(*m_playlist->m_current);
-	}
-	return 0;
-}
-
 RESULT eNavigation::connectEvent(const Slot2<void,eNavigation*,int> &event, ePtr<eConnection> &connection)
 {
 	connection = new eConnection(this, m_event.connect(event));
@@ -96,22 +38,15 @@ RESULT eNavigation::getCurrentService(ePtr<iPlayableService> &service)
 	return 0;
 }
 
-RESULT eNavigation::getPlaylist(ePtr<ePlaylist> &playlist)
-{
-	if (!m_playlist)
-		return -1;
-	playlist = m_playlist;
-	return 0;
-}
-
 RESULT eNavigation::stopService(void)
 {
 		/* check if there is a running service... */
 	if (!m_runningService)
 		return 1;
 			/* send stop event */
-	m_event(this, evStopService);
+	m_event(this, iPlayableService::evEnd);
 
+	m_runningService->stop();
 		/* kill service. */
 	m_runningService = 0;
 	m_service_event_conn = 0;
@@ -145,14 +80,11 @@ eNavigation::eNavigation(iServiceHandler *serviceHandler)
 {
 	assert(serviceHandler);
 	m_servicehandler = serviceHandler;
-	m_playlist = new ePlaylist;
-
-		/* start with no current selection */
-	m_playlist->m_current = m_playlist->end();
 }
 
 eNavigation::~eNavigation()
 {
+	stopService();
 }
 
 DEFINE_REF(eNavigation);