fix channel state handling

[enigma2.git] / lib / dvb / epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index c0a4d93f14a208e3ce68db540b0f3883ed61a2f4..eec08cc83f4883430d9973d6d05442242bb8a4fe 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -142,6 +142,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
                channel_data(eEPGCache*);
                eEPGCache *cache;
                eTimer abortTimer, zapTimer;
                channel_data(eEPGCache*);
                eEPGCache *cache;
                eTimer abortTimer, zapTimer;

+               int prevChannelState;

                __u8 state, isRunning, haveData, can_delete;
                ePtr<eDVBChannel> channel;
                ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;
                __u8 state, isRunning, haveData, can_delete;
                ePtr<eDVBChannel> channel;
                ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;


@@ -221,6 +222,7 @@ private:
        void DVBChannelRunning(iDVBChannel *);
 
        timeMap::iterator m_timemap_cursor, m_timemap_end;
        void DVBChannelRunning(iDVBChannel *);
 
        timeMap::iterator m_timemap_cursor, m_timemap_end;

+       int currentQueryTsidOnid; // needed for getNextTimeEntry.. only valid until next startTimeQuery call

 #endif // SWIG
 public:
        static eEPGCache *getInstance() { return instance; }
 #endif // SWIG
 public:
        static eEPGCache *getInstance() { return instance; }


@@ -256,8 +258,8 @@ public:
 
        // eServiceEvent are parsed epg events.. it's safe to use them after cache unlock
        // for use from python ( members: m_start_time, m_duration, m_short_description, m_extended_description )
 
        // eServiceEvent are parsed epg events.. it's safe to use them after cache unlock
        // for use from python ( members: m_start_time, m_duration, m_short_description, m_extended_description )

-       SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &);
-       SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &);
+       SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &SWIG_OUTPUT);
+       SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &SWIG_OUTPUT);

        SWIG_VOID(RESULT) getNextTimeEntry(ePtr<eServiceEvent> &SWIG_OUTPUT);
 };
 
        SWIG_VOID(RESULT) getNextTimeEntry(ePtr<eServiceEvent> &SWIG_OUTPUT);
 };