NavigationInstance.instance = self
self.ServiceHandler = eServiceCenterPtr()
- eServiceCenter.getInstance(self.ServiceHandler)
+ self.ServiceHandler = eServiceCenter.getInstance()
import Navigation as Nav
Nav.navcore = self
pNavigation::pNavigation()
{
- ePtr<eServiceCenter> service_center;
+ ePtr<iServiceHandler> service_center;
eServiceCenter::getInstance(service_center);
assert(service_center);
#ifdef SWIG
#define SWIG_INPUT INPUT
#define SWIG_OUTPUT OUTPUT
+#define SWIG_NAMED_OUTPUT(x) OUTPUT
#define SWIG_VOID(x) void
#else
#define SWIG_INPUT
#define SWIG_OUTPUT
+#define SWIG_NAMED_OUTPUT(x) x
#define SWIG_VOID(x) x
#endif
#include <lib/service/iservice.h>
#include <set>
-class eServiceCenter;
class eListboxServiceContent: public virtual iListboxContent
{
int m_size;
eSize m_itemsize;
- ePtr<eServiceCenter> m_service_center;
+ ePtr<iServiceHandler> m_service_center;
eServiceReference m_root;
RESULT offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr);
// eServiceCenter
- static RESULT getInstance(eServiceCenterPtr &ptr) { ptr = instance; return 0; }
+ static RESULT getPrivInstance(eServiceCenterPtr &ptr) { ptr = instance; return 0; }
+ static RESULT getInstance(iServiceHandlerPtr &SWIG_NAMED_OUTPUT(ptr)) { ptr = instance; return 0; }
RESULT addServiceFactory(int id, iServiceHandler *hnd);
RESULT removeServiceFactory(int id);
};
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::getPrivInstance(sc);
if (sc)
sc->addServiceFactory(eServiceFactoryDVB::id, this);
}
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::getPrivInstance(sc);
if (sc)
sc->removeServiceFactory(eServiceFactoryDVB::id);
}
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::getPrivInstance(sc);
if (sc)
sc->addServiceFactory(eServiceFactoryFS::id, this);
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::getPrivInstance(sc);
if (sc)
sc->removeServiceFactory(eServiceFactoryFS::id);
}
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::getPrivInstance(sc);
if (sc)
sc->addServiceFactory(eServiceFactoryMP3::id, this);
{
ePtr<eServiceCenter> sc;
- eServiceCenter::getInstance(sc);
+ eServiceCenter::getPrivInstance(sc);
if (sc)
sc->removeServiceFactory(eServiceFactoryMP3::id);
}