switch (event)
{
case iPlayableService::evEnd:
- /* our running main service stopped. */
- if (!m_playlist.empty())
- m_playlist.erase(m_playlist.begin());
- if (!m_playlist.empty())
+ 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. */
+
+ /* 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())
{
- RESULT res;
- res = playService(m_playlist.front());
- if (res)
- m_event(this, evPlayFailed);
- } else
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);
RESULT eNavigation::playService(const eServiceReference &service)
{
+ assert(m_servicehandler);
RESULT res = m_servicehandler->play(service, m_runningService);
if (m_runningService)
{
RESULT eNavigation::enqueueService(const eServiceReference &service)
{
- int doplay = m_playlist.empty();
- m_playlist.push_back(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)
- return playService(m_playlist.front());
+ {
+ 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(m_event.connect(event));
+ connection = new eConnection(this, m_event.connect(event));
return 0;
}
return 0;
}
+RESULT eNavigation::getPlaylist(ePtr<ePlaylist> &playlist)
+{
+ if (!m_playlist)
+ return -1;
+ playlist = m_playlist;
+ return 0;
+}
+
RESULT eNavigation::pause(int dop)
{
if (!m_runningService)
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()