fix calculation in calculateDifference for cable and terrestrial which should complet...

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

diff --git a/lib/service/event.h b/lib/service/event.h
index d224c183de311f9f42119657afec2e4e5c5d3f4a..9ee6538bd08d4c2462a55765c37d2f60e9983c51 100644 (file)
--- a/lib/service/event.h
+++ b/lib/service/event.h
@@ -4,6 +4,7 @@
 #ifndef SWIG
 #include <time.h>
 #include <lib/base/object.h>
+#include <lib/service/iservice.h>
 #include <list>
 #include <string>
 class Event;
@@ -28,37 +29,31 @@ DECLARE_REF(eComponentData);
 
 TEMPLATE_TYPEDEF(ePtr<eComponentData>, eComponentDataPtr);
 
-struct linkage_service
-{
-       uint16_t m_sid;
-       uint16_t m_onid;
-       uint16_t m_tsid;
-       std::string m_description;
-};
-
 class eServiceEvent: public iObject
 {
-DECLARE_REF(eServiceEvent);
-#ifndef SWIG
+       DECLARE_REF(eServiceEvent);
        bool loadLanguage(Event *event, std::string lang, int tsidonid);
        std::list<eComponentData> m_component_data;
-#endif
-public:
-#ifndef SWIG
-       std::list<linkage_service> m_linkage_services;
+       std::list<eServiceReference> m_linkage_services;
        time_t m_begin;
        int m_duration;
+       int m_event_id;
        std::string m_event_name, m_short_description, m_extended_description;
        // .. additional info
+public:
+#ifndef SWIG
        RESULT parseFrom(Event *evt, int tsidonid=0);
 #endif
        time_t getBeginTime() const { return m_begin; }
        int getDuration() const { return m_duration; }
+       int getEventId() const { return m_event_id; }
        std::string getEventName() const { return m_event_name; }
        std::string getShortDescription() const { return m_short_description; }
        std::string getExtendedDescription() const { return m_extended_description; }
        std::string getBeginTimeString() const;
        SWIG_VOID(RESULT) getComponentData(ePtr<eComponentData> &SWIG_OUTPUT, int tagnum) const;
+       int getNumOfLinkageServices() const { return m_linkage_services.size(); }
+       SWIG_VOID(RESULT) getLinkageService(eServiceReference &SWIG_OUTPUT, eServiceReference &parent, int num) const;
 };
 
 TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);