git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix inverted setting (meaning was inverted too)
[enigma2.git]
/
lib
/
nav
/
pcore.cpp
diff --git
a/lib/nav/pcore.cpp
b/lib/nav/pcore.cpp
index 23df0030e7d34c9cc79d3f42a551df52a901f606..5be1dfd26f2dd9bdcf83c92bdab67c53560fd27b 100644
(file)
--- a/
lib/nav/pcore.cpp
+++ b/
lib/nav/pcore.cpp
@@
-7,7
+7,7
@@
DEFINE_REF(pNavigation);
pNavigation::pNavigation()
{
pNavigation::pNavigation()
{
- ePtr<
eServiceCent
er> service_center;
+ ePtr<
iServiceHandl
er> service_center;
eServiceCenter::getInstance(service_center);
assert(service_center);
eServiceCenter::getInstance(service_center);
assert(service_center);
@@
-21,19
+21,9
@@
RESULT pNavigation::playService(const eServiceReference &service)
return m_core->playService(service);
}
return m_core->playService(service);
}
-RESULT pNavigation::recordService(const eServiceReference &service)
+RESULT pNavigation::recordService(const eServiceReference &
ref, ePtr<iRecordableService> &
service)
{
{
- return m_core->recordService(service);
-}
-
-RESULT pNavigation::endRecording()
-{
- return m_core->endRecording();
-}
-
-RESULT pNavigation::enqueueService(const eServiceReference &service)
-{
- return m_core->enqueueService(service);
+ return m_core->recordService(ref, service);
}
RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
}
RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
@@
-41,14
+31,14
@@
RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
return m_core->getCurrentService(service);
}
return m_core->getCurrentService(service);
}
-RESULT pNavigation::
getPlaylist(ePtr<ePlaylist> &playlist
)
+RESULT pNavigation::
pause(int p
)
{
{
- return m_core->
getPlaylist(playlist
);
+ return m_core->
pause(p
);
}
}
-RESULT pNavigation::
pause(int p
)
+RESULT pNavigation::
stopService(
)
{
{
- return m_core->
pause(p
);
+ return m_core->
stopService(
);
}
void pNavigation::navEvent(eNavigation *nav, int event)
}
void pNavigation::navEvent(eNavigation *nav, int event)
@@
-65,11
+55,16
@@
void pNavigation::navEvent(eNavigation *nav, int event)
case eNavigation::evPlayFailed:
m_event(evPlayFailed);
break;
case eNavigation::evPlayFailed:
m_event(evPlayFailed);
break;
- case eNavigation::evPlaylistDone:
- m_event(evPlaylistDone);
- break;
case eNavigation::evUpdatedEventInfo:
m_event(evUpdatedEventInfo);
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);
}
}
}
}