X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/43eacf2ca5189458bd43ca947242ec3b3bc5a5f4..895e6dc35b9a3579ee9535d560b4ce91ed9c0c60:/lib/service/event.h

diff --git a/lib/service/event.h b/lib/service/event.h
index 285a4ae3..4c354079 100644
--- a/lib/service/event.h
+++ b/lib/service/event.h
@@ -3,32 +3,38 @@
 
 #ifndef SWIG
 #include <time.h>
-#include <lib/base/object.h>
-#include <lib/service/iservice.h>
 #include <list>
 #include <string>
 class Event;
 #endif
 
+#include <lib/base/object.h>
+#include <lib/service/iservice.h>
+
+SWIG_IGNORE(eComponentData);
 struct eComponentData
 {
-DECLARE_REF(eComponentData);
-#ifndef SWIG
+	friend class eServiceEvent;
+	DECLARE_REF(eComponentData);
 	uint8_t m_streamContent;
 	uint8_t m_componentType;
 	uint8_t m_componentTag;
 	std::string m_iso639LanguageCode;
 	std::string m_text;
-#endif
+public:
+	eComponentData(const eComponentData& d) { *this = d; } 
+	eComponentData() { m_streamContent = m_componentType = m_componentTag = 0; }
 	int getStreamContent(void) const { return m_streamContent; }
 	int getComponentType(void) const { return m_componentType; }
 	int getComponentTag(void) const { return m_componentTag; }
 	std::string getIso639LanguageCode(void) const { return m_iso639LanguageCode; }
 	std::string getText(void) const { return m_text; }
 };
+SWIG_TEMPLATE_TYPEDEF(ePtr<eComponentData>, eComponentDataPtr);
 
-TEMPLATE_TYPEDEF(ePtr<eComponentData>, eComponentDataPtr);
+SWIG_ALLOW_OUTPUT_SIMPLE(eServiceReference);  // needed for SWIG_OUTPUT in eServiceEvent::getLinkageService
 
+SWIG_IGNORE(eServiceEvent);
 class eServiceEvent: public iObject
 {
 	DECLARE_REF(eServiceEvent);
@@ -44,8 +50,9 @@ class eServiceEvent: public iObject
 public:
 #ifndef SWIG
 	RESULT parseFrom(Event *evt, int tsidonid=0);
-#endif
+	RESULT parseFrom(const std::string filename, int tsidonid=0);
 	static void setEPGLanguage( const std::string language );
+#endif
 	time_t getBeginTime() const { return m_begin; }
 	int getDuration() const { return m_duration; }
 	int getEventId() const { return m_event_id; }
@@ -54,13 +61,21 @@ public:
 	std::string getExtendedDescription() const { return m_extended_description; }
 	std::string getBeginTimeString() const;
 	SWIG_VOID(RESULT) getComponentData(ePtr<eComponentData> &SWIG_OUTPUT, int tagnum) const;
+	PyObject *getComponentData() const;
 	int getNumOfLinkageServices() const { return m_linkage_services.size(); }
 	SWIG_VOID(RESULT) getLinkageService(eServiceReference &SWIG_OUTPUT, eServiceReference &parent, int num) const;
 };
+SWIG_TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEvent);
+SWIG_EXTEND(ePtr<eServiceEvent>,
+	static void setEPGLanguage( const std::string language )
+	{
+		extern void setServiceEventLanguage(const std::string language);
+		setServiceEventLanguage(language);
+	}
+);
 
-TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
 #ifndef SWIG
-
+SWIG_IGNORE(eDebugClass);
 class eDebugClass: public iObject
 {
 	DECLARE_REF(eDebugClass);
@@ -70,8 +85,7 @@ public:
 	eDebugClass(int i) { printf("build debug class %d\n", i); x = i; }
 	~eDebugClass() { printf("remove debug class %d\n", x); }
 };
-
-// TEMPLATE_TYPEDEF(ePtr<eDebugClass>, eDebugClassPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<eDebugClass>, eDebugClassPtr);
 #endif
 
 #endif