aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-11-13 14:39:27 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-11-13 14:39:27 +0000
commitab92ba5e6b439cb9a0aabc8c9330ec7d4ad9b301 (patch)
tree8fed419474f1dd2bb2ebfa3c4de6e885125eedea
parent718dac0e6e2bcd6727dda2eeae49ddc3518515b9 (diff)
downloadenigma2-ab92ba5e6b439cb9a0aabc8c9330ec7d4ad9b301.tar.gz
enigma2-ab92ba5e6b439cb9a0aabc8c9330ec7d4ad9b301.zip
better handling for time_t .. use typedef
-rw-r--r--lib/dvb/epgcache.h2
-rw-r--r--lib/python/enigma_python.i1
-rw-r--r--lib/service/event.h5
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index aa0410b3..01d738cb 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -237,7 +237,7 @@ public:
// eventData's are plain entrys out of the cache.. it's not safe to use them after cache unlock
// but its faster in use... its not allowed to delete this pointers via delete or free..
RESULT lookupEvent(const eServiceReference &service, int event_id, const eventData *&);
- RESULT lookupEvent(const eServiceReference &service, time_t , const eventData *&);
+ RESULT lookupEvent(const eServiceReference &service, time_t, const eventData *&);
RESULT getNextTimeEntry(const eventData *&);
#ifndef SWIG
diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 7aa90812..7764f8ca 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -113,6 +113,7 @@ extern PSignal1<void,int> &keyPressedSignal();
#define DEBUG
+typedef long time_t;
%include "typemaps.i"
%include "stl.i"
%include <lib/python/swig.h>
diff --git a/lib/service/event.h b/lib/service/event.h
index cbce6f17..7e6cf5d8 100644
--- a/lib/service/event.h
+++ b/lib/service/event.h
@@ -2,13 +2,12 @@
#define __lib_service_event_h
#ifndef PYTHON
-
#include <time.h>
#include <lib/base/object.h>
#include <string>
class Event;
-
#endif
+
class eServiceEvent: public iObject
{
DECLARE_REF(eServiceEvent);
@@ -21,7 +20,7 @@ public:
bool loadLanguage(Event *event, std::string lang);
RESULT parseFrom(Event *evt);
#endif
- long getBeginTime() { return (long)m_begin; }
+ time_t getBeginTime() { return m_begin; }
int getDuration() { return m_duration; }
std::string getEventName() { return m_event_name; }
std::string getShortDescription() { return m_short_description; }