remove ugly HACK

send evEnd in correct order (this assumes that no one need the
currentService after evEnd is dispatched or in the evEnd callback

diff --git a/Navigation.py b/Navigation.py
index ece892275a6458f74614cb3e9a07ba57aecf9356..06d47ac4fcad6f6cf83de246bde15670c52942a3 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -28,12 +28,10 @@ class Navigation:
                self.record_event = [ ]
                self.currentlyPlayingServiceReference = None
                self.currentlyPlayingService = None
                self.record_event = [ ]
                self.currentlyPlayingServiceReference = None
                self.currentlyPlayingService = None

-               self.state = 0

                self.RecordTimer = RecordTimer.RecordTimer()
                self.SleepTimer = SleepTimer.SleepTimer()
 
        def dispatchEvent(self, i):
                self.RecordTimer = RecordTimer.RecordTimer()
                self.SleepTimer = SleepTimer.SleepTimer()
 
        def dispatchEvent(self, i):

-               self.state = i != 1

                for x in self.event:
                        x(i)
 
                for x in self.event:
                        x(i)
 


@@ -91,11 +89,9 @@ class Navigation:
                return self.pnav and self.pnav.getRecordings()
 
        def getCurrentService(self):
                return self.pnav and self.pnav.getRecordings()
 
        def getCurrentService(self):

-               if self.state:
-                       if not self.currentlyPlayingService:
-                               self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
-                       return self.currentlyPlayingService
-               return None
+               if not self.currentlyPlayingService:
+                       self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+               return self.currentlyPlayingService

 
        def stopService(self):
                print "stopService"
 
        def stopService(self):
                print "stopService"

diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
index 45b4aa6fe99d251ab65927b2a2626b78bfd5dc7e..0b690b812b742d40dd31c5ec58eebd0f1c7df994 100644 (file)
--- a/lib/nav/core.cpp
+++ b/lib/nav/core.cpp
@@ -59,13 +59,14 @@ RESULT eNavigation::stopService(void)
                /* check if there is a running service... */
        if (!m_runningService)
                return 1;
                /* check if there is a running service... */
        if (!m_runningService)
                return 1;

-                       /* send stop event */
-       m_event(iPlayableService::evEnd);

 
        ePtr<iPlayableService> tmp = m_runningService;
        m_runningService=0;
        tmp->stop();
 
 
        ePtr<iPlayableService> tmp = m_runningService;
        m_runningService=0;
        tmp->stop();
 

+       /* send stop event */
+       m_event(iPlayableService::evEnd);
+

                /* kill service. */
        m_service_event_conn = 0;
        return 0;
                /* kill service. */
        m_service_event_conn = 0;
        return 0;