remove navigation events, they correspond to the iPlayableService events now

4 files changed, 4 insertions, 65 deletions

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index 9bb43615..71204787 100644
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -9,26 +9,7 @@ void eNavigation::serviceEvent(iPlayableService* service, int event)
 		return;
 	}
 
-	switch (event)
-	{	
-	case iPlayableService::evEnd:
-		m_event(this, evEnd);
-		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;
-	case iPlayableService::evSeekableStatusChanged:
-		m_event(this, evSeekableStatusChanged);
-		break;
-	default:
-		break;
-	}
+	m_event(this, event);
 }
 
 RESULT eNavigation::playService(const eServiceReference &service)
@@ -63,8 +44,9 @@ RESULT eNavigation::stopService(void)
 	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;
diff --git a/lib/nav/core.h b/lib/nav/core.h
index f1146b44..fbcd566d 100644
--- a/lib/nav/core.h
+++ b/lib/nav/core.h
@@ -16,16 +16,6 @@ private:
 	ePtr<eConnection> m_service_event_conn;
 	void serviceEvent(iPlayableService* service, int event);
 public:
-	enum
-	{
-		evStopService,  /** the "current" service was just stopped and likes to be deallocated (clear refs!) */
-		evNewService,   /** a new "current" service was just started */
-		evPlayFailed,   /** the next service (in playlist) or the one given in playService failed to play */
-		evUpdatedEventInfo, /** the "currently running" event info was updated */
-		evUpdatedInfo, /** the program info of this service was updated */
-		evSeekableStatusChanged,
-		evEnd
-	};
 	
 	RESULT playService(const eServiceReference &service);
 	RESULT connectEvent(const Slot2<void,eNavigation*,int> &event, ePtr<eConnection> &connection);
diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
index 5be1dfd2..fdcb385e 100644
--- a/lib/nav/pcore.cpp
+++ b/lib/nav/pcore.cpp
@@ -44,27 +44,5 @@ RESULT pNavigation::stopService()
 void pNavigation::navEvent(eNavigation *nav, 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::evUpdatedEventInfo:
-		m_event(evUpdatedEventInfo);
-		break;
-	case eNavigation::evUpdatedInfo:
-		m_event(evUpdatedInfo);
-		break;
-	case eNavigation::evSeekableStatusChanged:
-		m_event(evSeekableStatusChanged);
-		break;
-	case eNavigation::evEnd:
-		m_event(evEnd);
-	}
+	m_event(event);
 }
diff --git a/lib/nav/pcore.h b/lib/nav/pcore.h
index 07c979d6..e9a06403 100644
--- a/lib/nav/pcore.h
+++ b/lib/nav/pcore.h
@@ -12,17 +12,6 @@ DECLARE_REF(pNavigation);
 public:
 	PSignal1<void, int> m_event;
 	
-	enum
-	{
-		evStopService,  /** the "current" service was just stopped and likes to be deallocated (clear refs!) */
-		evNewService,   /** a new "current" service was just started */
-		evPlayFailed,   /** the next service (in playlist) or the one given in playService failed to play */
-		evUpdatedEventInfo, /** the "currently running" event info was updated */
-		evUpdatedInfo, /** the program info of this service was updated */
-		evSeekableStatusChanged,
-		evEnd
-	};
-	
 	pNavigation();
 	
 	RESULT playService(const eServiceReference &service);