more pid cache stuff

[enigma2.git] / lib / service / servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index c54eb5c0b0afc683c563511adbc266c68ebd3712..5c7504308f792513ae58fcaf7210e2159522de4c 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -1,14 +1,15 @@
-#ifndef __servicemp3_h
-#define __servicemp3_h
+#ifndef __servicedvb_h
+#define __servicedvb_h

 
 #include <lib/service/iservice.h>
 #include <lib/dvb/idvb.h>
 
 #include <lib/dvb/pmt.h>
 
 #include <lib/service/iservice.h>
 #include <lib/dvb/idvb.h>
 
 #include <lib/dvb/pmt.h>

+#include <lib/dvb/eit.h>

 
 class eServiceFactoryDVB: public iServiceHandler
 {
 
 class eServiceFactoryDVB: public iServiceHandler
 {

-DECLARE_REF;
+DECLARE_REF(eServiceFactoryDVB);

 public:
        eServiceFactoryDVB();
        virtual ~eServiceFactoryDVB();
 public:
        eServiceFactoryDVB();
        virtual ~eServiceFactoryDVB();


@@ -18,22 +19,44 @@ public:
        RESULT play(const eServiceReference &, ePtr<iPlayableService> &ptr);
        RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr);
        RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
        RESULT play(const eServiceReference &, ePtr<iPlayableService> &ptr);
        RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr);
        RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);

+       RESULT info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr);
+private:
+       RESULT lookupService(ePtr<eDVBService> &ptr, const eServiceReference &ref);
+};
+
+class eDVBServiceList: public iListableService
+{
+DECLARE_REF(eDVBServiceList);
+private:
+       eServiceReference m_parent;
+       friend class eServiceFactoryDVB;
+       eDVBServiceList(const eServiceReference &parent);
+public:
+       virtual ~eDVBServiceList();
+       RESULT getContent(std::list<eServiceReference> &list);
+       RESULT getNext(eServiceReference &ptr);

 };
 
 class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
 {
 };
 
 class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
 {

-DECLARE_REF;
+DECLARE_REF(eDVBServicePlay);

 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
        
 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
        

+       ePtr<eDVBService> m_dvb_service;
+       

        ePtr<iTSMPEGDecoder> m_decoder;
        
        ePtr<iTSMPEGDecoder> m_decoder;
        

-       eDVBServicePMTHandler m_serviceHandler;
+       eDVBServicePMTHandler m_service_handler;
+       eDVBServiceEITHandler m_event_handler;
+       
+       eDVBServicePlay(const eServiceReference &ref, eDVBService *service);

        
        

-       eDVBServicePlay(const eServiceReference &ref);
+       void gotNewEvent();

        
        void serviceEvent(int event);
        
        void serviceEvent(int event);

+       Signal2<void,iPlayableService*,int> m_event;

 public:
        virtual ~eDVBServicePlay();
 
 public:
        virtual ~eDVBServicePlay();
 


@@ -41,11 +64,12 @@ public:
        RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
        RESULT start();
        RESULT stop();
        RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
        RESULT start();
        RESULT stop();

-       RESULT getIPausableService(ePtr<iPauseableService> &ptr);
-       RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr);
+       RESULT pause(ePtr<iPauseableService> &ptr);
+       RESULT info(ePtr<iServiceInformation> &ptr);

        
                // iServiceInformation
        
                // iServiceInformation

-       RESULT getName(const eServiceReference &ref, std::string &name);
+       RESULT getName(std::string &name);
+       RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);

 };
 
 #endif
 };
 
 #endif