aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2005-02-27 02:20:31 +0000
committerFelix Domke <tmbinc@elitedvb.net>2005-02-27 02:20:31 +0000
commitdba614edd2aad3c17e244914eaef3809d8300cb1 (patch)
tree382782ddff50bf88e421d933b13e35b9e5682cff /lib/dvb
parent1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b (diff)
downloadenigma2-dba614edd2aad3c17e244914eaef3809d8300cb1.tar.gz
enigma2-dba614edd2aad3c17e244914eaef3809d8300cb1.zip
- hopefully fixed some python/refcount stuff (__deref__ is still evil!)
- first work on skin support, not really far - improved infobar - deletes components when destroying screens - fixed elistbox and component - add ability to change bouqet - real query parser still unfinished
Diffstat (limited to 'lib/dvb')
-rw-r--r--lib/dvb/db.h4
-rw-r--r--lib/dvb/decoder.h6
-rw-r--r--lib/dvb/demux.h4
-rw-r--r--lib/dvb/dvb.h4
-rw-r--r--lib/dvb/esection.h2
-rw-r--r--lib/dvb/frontend.h4
-rw-r--r--lib/dvb/idvb.h4
-rw-r--r--lib/dvb/list.h2
-rw-r--r--lib/dvb/scan.h2
-rw-r--r--lib/dvb/sec.h2
10 files changed, 17 insertions, 17 deletions
diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 55998ebf..22eb0b74 100644
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -8,7 +8,7 @@ class ServiceDescriptionTable;
class eDVBDB: public iDVBChannelList
{
-DECLARE_REF;
+DECLARE_REF(eDVBDB);
friend class eDVBDBQuery;
private:
struct channel
@@ -37,7 +37,7 @@ public:
// we have to add a possibility to invalidate here.
class eDVBDBQuery: public iDVBChannelListQuery
{
-DECLARE_REF;
+DECLARE_REF(eDVBDBQuery);
private:
std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator m_cursor;
ePtr<eDVBDB> m_db;
diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index b1e65611..b566df89 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -6,7 +6,7 @@
class eDVBAudio: public iObject
{
-DECLARE_REF;
+DECLARE_REF(eDVBAudio);
private:
ePtr<eDVBDemux> m_demux;
int m_fd, m_fd_demux;
@@ -19,7 +19,7 @@ public:
class eDVBVideo: public iObject
{
-DECLARE_REF;
+DECLARE_REF(eDVBVideo);
private:
ePtr<eDVBDemux> m_demux;
int m_fd, m_fd_demux;
@@ -32,7 +32,7 @@ public:
class eTSMPEGDecoder: public iTSMPEGDecoder
{
-DECLARE_REF;
+DECLARE_REF(eTSMPEGDecoder);
private:
ePtr<eDVBDemux> m_demux;
ePtr<eDVBAudio> m_audio;
diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index c7fa5bc0..d8c1078e 100644
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -11,7 +11,7 @@ class eDVBDemux: public iDVBDemux
friend class eDVBAudio;
friend class eDVBVideo;
public:
- DECLARE_REF
+ DECLARE_REF(eDVBDemux);
eDVBDemux(int adapter, int demux);
virtual ~eDVBDemux();
RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
@@ -20,7 +20,7 @@ public:
class eDVBSectionReader: public iDVBSectionReader, public Object
{
- DECLARE_REF
+ DECLARE_REF(eDVBSectionReader);
private:
int fd;
Signal1<void, const __u8*> read;
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 52dd9a07..8a13b403 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -10,7 +10,7 @@ class eDVBChannel;
class eDVBResourceManager: public iDVBResourceManager
{
- DECLARE_REF;
+ DECLARE_REF(eDVBResourceManager);
int avail, busy;
struct adapter
{
@@ -40,7 +40,7 @@ public:
class eDVBChannel: public iDVBChannel, public eDVBDemux, public Object
{
- DECLARE_REF;
+ DECLARE_REF(eDVBChannel);
private:
ePtr<eDVBFrontend> m_frontend;
ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 6b8c8784..df0b93e5 100644
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -6,7 +6,7 @@
class eGTable: public iObject, public Object
{
-DECLARE_REF;
+DECLARE_REF(eGTable);
private:
ePtr<iDVBSectionReader> m_reader;
eDVBTableSpec m_table;
diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 9036dc3e..f4e99fae 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -6,7 +6,7 @@
class eDVBFrontendParameters: public iDVBFrontendParameters
{
- DECLARE_REF;
+ DECLARE_REF(eDVBFrontendParameters);
union
{
eDVBFrontendParametersSatellite sat;
@@ -33,7 +33,7 @@ public:
class eDVBFrontend: public iDVBFrontend, public Object
{
- DECLARE_REF;
+ DECLARE_REF(eDVBFrontend);
int m_type;
int m_fd;
#if HAVE_DVB_API_VERSION < 3
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 4d728b4c..da626866 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -160,7 +160,7 @@ class eDVBChannelQuery;
class eDVBService: public iStaticServiceInformation
{
- DECLARE_REF;
+ DECLARE_REF(eDVBService);
public:
eDVBService();
std::string m_service_name;
@@ -194,7 +194,7 @@ public:
class eDVBChannelQuery: public iObject
{
- DECLARE_REF;
+ DECLARE_REF(eDVBChannelQuery);
public:
enum
{
diff --git a/lib/dvb/list.h b/lib/dvb/list.h
index 6df49803..80ad20e8 100644
--- a/lib/dvb/list.h
+++ b/lib/dvb/list.h
@@ -3,7 +3,7 @@
class eDVBTransponderList: iDVBChannelList
{
- DECLARE_REF;
+ DECLARE_REF(eDVBTransponderList);
private:
std::map<eDVBChannelID, ePtr<iDVBFrontendParameters> > channels;
public:
diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index 96264e88..2f75291b 100644
--- a/lib/dvb/scan.h
+++ b/lib/dvb/scan.h
@@ -10,7 +10,7 @@
class eDVBScan: public Object, public iObject
{
-DECLARE_REF;
+DECLARE_REF(eDVBScan);
private:
/* chid helper functions: */
diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 0bda004c..ea01108d 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -7,7 +7,7 @@
class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
{
public:
- DECLARE_REF;
+ DECLARE_REF(eDVBSatelliteEquipmentControl);
eDVBSatelliteEquipmentControl();
RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat);
};