- work on actions

 - changed time when screens are acutally constructed
 - added service name (not working atm) and event info (now&next)

1 files changed, 23 insertions, 5 deletions

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index 10d18e32..99dcf2ec 100644
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -14,11 +14,10 @@ void eNavigation::serviceEvent(iPlayableService* service, int event)
 	case iPlayableService::evEnd:
 		assert(m_playlist); /* we need to have a playlist */
 		
-			/* at first, kill the running service */
-		m_event(this, evStopService);
-		m_runningService = 0;
-		m_service_event_conn = 0;
-			/* our running main service stopped. identify what to do next. */
+		/* 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 */
@@ -41,6 +40,9 @@ void eNavigation::serviceEvent(iPlayableService* service, int event)
 	case iPlayableService::evStart:
 		m_event(this, evNewService);
 		break;
+	case iPlayableService::evUpdatedEventInfo:
+		m_event(this, evUpdatedEventInfo);
+		break;
 	default:
 		break;
 	}
@@ -48,6 +50,8 @@ void eNavigation::serviceEvent(iPlayableService* service, int event)
 
 RESULT eNavigation::playService(const eServiceReference &service)
 {
+	stopService();
+	
 	assert(m_servicehandler);
 	RESULT res = m_servicehandler->play(service, m_runningService);
 	if (m_runningService)
@@ -97,6 +101,20 @@ RESULT eNavigation::getPlaylist(ePtr<ePlaylist> &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);
+
+		/* kill service. */
+	m_runningService = 0;
+	m_service_event_conn = 0;
+	return 0;
+}
+
 RESULT eNavigation::pause(int dop)
 {
 	if (!m_runningService)