git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add optional notification of childs when parent moves
[enigma2.git]
/
lib
/
nav
/
pcore.cpp
diff --git
a/lib/nav/pcore.cpp
b/lib/nav/pcore.cpp
index 7b61ce5c4d67a0f85305692408141acac4875df1..fdcb385e283567621a4179612c43c90e700c05b2 100644
(file)
--- a/
lib/nav/pcore.cpp
+++ b/
lib/nav/pcore.cpp
@@
-1,15
+1,19
@@
#include <lib/nav/pcore.h>
#include <lib/service/service.h>
#include <lib/nav/pcore.h>
#include <lib/service/service.h>
+#include <lib/service/event.h>
+#include <lib/base/eerror.h>
DEFINE_REF(pNavigation);
pNavigation::pNavigation()
{
DEFINE_REF(pNavigation);
pNavigation::pNavigation()
{
- ePtr<
eServiceCent
er> service_center;
+ ePtr<
iServiceHandl
er> service_center;
eServiceCenter::getInstance(service_center);
assert(service_center);
m_core = new eNavigation(service_center);
eServiceCenter::getInstance(service_center);
assert(service_center);
m_core = new eNavigation(service_center);
+
+ m_core->connectEvent(slot(*this, &pNavigation::navEvent), m_nav_event_connection);
}
RESULT pNavigation::playService(const eServiceReference &service)
}
RESULT pNavigation::playService(const eServiceReference &service)
@@
-17,9
+21,9
@@
RESULT pNavigation::playService(const eServiceReference &service)
return m_core->playService(service);
}
return m_core->playService(service);
}
-RESULT pNavigation::
enqueueService(const eServiceReference
&service)
+RESULT pNavigation::
recordService(const eServiceReference &ref, ePtr<iRecordableService>
&service)
{
{
- return m_core->
enqueueService(
service);
+ return m_core->
recordService(ref,
service);
}
RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
}
RESULT pNavigation::getCurrentService(ePtr<iPlayableService> &service)
@@
-27,12
+31,18
@@
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)
+{
+ /* just relay the events here. */
+ m_event(event);
}
}