git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more python fixes
[enigma2.git]
/
lib
/
dvb
/
dvb.h
diff --git
a/lib/dvb/dvb.h
b/lib/dvb/dvb.h
index 15e27536cef9f10d1be3e30e06a72b37144d68e9..3ad3cc1bf27584ef26d1d88b474d2a30c9a830e9 100644
(file)
--- a/
lib/dvb/dvb.h
+++ b/
lib/dvb/dvb.h
@@
-1,6
+1,8
@@
#ifndef __dvb_dvb_h
#define __dvb_dvb_h
#ifndef __dvb_dvb_h
#define __dvb_dvb_h
+#ifndef SWIG
+
#include <lib/base/ebase.h>
#include <lib/base/filepush.h>
#include <lib/base/elock.h>
#include <lib/base/ebase.h>
#include <lib/base/filepush.h>
#include <lib/base/elock.h>
@@
-117,6
+119,8
@@
private:
eSmartPtrList<eDVBDemux> m_demux;
};
eSmartPtrList<eDVBDemux> m_demux;
};
+#endif // SWIG
+
class eDVBResourceManager: public iObject, public Object
{
DECLARE_REF(eDVBResourceManager);
class eDVBResourceManager: public iObject, public Object
{
DECLARE_REF(eDVBResourceManager);
@@
-167,15
+171,16
@@
class eDVBResourceManager: public iObject, public Object
bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
eUsePtr<iDVBChannel> m_cached_channel;
bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
eUsePtr<iDVBChannel> m_cached_channel;
+ Connection m_cached_channel_state_changed_conn;
eTimer m_releaseCachedChannelTimer;
void DVBChannelStateChanged(iDVBChannel*);
void releaseCachedChannel();
eTimer m_releaseCachedChannelTimer;
void DVBChannelStateChanged(iDVBChannel*);
void releaseCachedChannel();
+#ifndef SWIG
public:
public:
+#endif
eDVBResourceManager();
virtual ~eDVBResourceManager();
eDVBResourceManager();
virtual ~eDVBResourceManager();
-
- static RESULT getInstance(ePtr<eDVBResourceManager> &ptr) { if (instance) { ptr = instance; return 0; } return -1; }
-
+
RESULT setChannelList(iDVBChannelList *list);
RESULT getChannelList(ePtr<iDVBChannelList> &list);
RESULT setChannelList(iDVBChannelList *list);
RESULT getChannelList(ePtr<iDVBChannelList> &list);
@@
-185,15
+190,20
@@
public:
errChidNotFound = -3
};
errChidNotFound = -3
};
+ RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
+ bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+
/* allocate channel... */
RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
/* allocate channel... */
RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
- RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index);
RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
-
- RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-
- bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+#ifdef SWIG
+public:
+#endif
+ RESULT allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
+ static RESULT getInstance(ePtr<eDVBResourceManager> &SWIG_OUTPUT);
};
};
+TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManagerPtr);
+#ifndef SWIG
/* iDVBPVRChannel includes iDVBChannel. don't panic. */
class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
/* iDVBPVRChannel includes iDVBChannel. don't panic. */
class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
@@
-217,7
+227,8
@@
public:
RESULT setCIRouting(const eDVBCIRouting &routing);
RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
RESULT setCIRouting(const eDVBCIRouting &routing);
RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
-
+ RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> ¶m);
+
/* iDVBPVRChannel */
RESULT playFile(const char *file);
void stopFile();
/* iDVBPVRChannel */
RESULT playFile(const char *file);
void stopFile();
@@
-229,7
+240,6
@@
public:
int getUseCount() { return m_use_count; }
private:
int getUseCount() { return m_use_count; }
private:
- ePtr<iDVBFrontendParameters> m_feparm; // for retune on lostlock
ePtr<eDVBAllocatedFrontend> m_frontend;
ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
ePtr<eDVBAllocatedFrontend> m_frontend;
ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
@@
-249,7
+259,7
@@
private:
eFilePushThread *m_pvr_thread;
void pvrEvent(int event);
eFilePushThread *m_pvr_thread;
void pvrEvent(int event);
- int m_pvr_fd_
src, m_pvr_fd_
dst;
+ int m_pvr_fd_dst;
eDVBTSTools m_tstools;
ePtr<eCueSheet> m_cue;
eDVBTSTools m_tstools;
ePtr<eCueSheet> m_cue;
@@
-271,4
+281,5
@@
private:
void ReleaseUse();
};
void ReleaseUse();
};
+#endif // SWIG
#endif
#endif