- new GUI lib

 - fixes

10 files changed, 24 insertions, 20 deletions

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 763df7eb..fe4833cd 100644
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -20,7 +20,7 @@ public:
 
 class ServiceDescriptionTable;
 
-class eDVBDB: public virtual iDVBChannelList
+class eDVBDB: public iDVBChannelList
 {
 DECLARE_REF;
 private:
diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 6694e9fc..b1e65611 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -4,7 +4,7 @@
 #include <lib/base/object.h>
 #include <lib/dvb/demux.h>
 
-class eDVBAudio: public virtual iObject
+class eDVBAudio: public iObject
 {
 DECLARE_REF;
 private:
@@ -17,7 +17,7 @@ public:
 	virtual ~eDVBAudio();
 };
 
-class eDVBVideo: public virtual iObject
+class eDVBVideo: public iObject
 {
 DECLARE_REF;
 private:
@@ -30,7 +30,7 @@ public:
 	virtual ~eDVBVideo();
 };
 
-class eTSMPEGDecoder: public virtual iTSMPEGDecoder
+class eTSMPEGDecoder: public iTSMPEGDecoder
 {
 DECLARE_REF;
 private:
diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index 3b4cbede..c7fa5bc0 100644
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -4,7 +4,7 @@
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/isection.h>
 
-class eDVBDemux: public virtual iDVBDemux
+class eDVBDemux: public iDVBDemux
 {
 	int adapter, demux;
 	friend class eDVBSectionReader;
@@ -18,7 +18,7 @@ public:
 	RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
 };
 
-class eDVBSectionReader: public virtual iDVBSectionReader, public Object
+class eDVBSectionReader: public iDVBSectionReader, public Object
 {
 	DECLARE_REF
 private:
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 29ffa151..8acd0c5d 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -90,6 +90,8 @@ RESULT eDVBResourceManager::removeChannel(const eDVBChannelID &chid, eDVBChannel
 	return -ENOENT;
 }
 
+DEFINE_REF(eDVBChannel);
+
 eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, int adapter, int frontend, int demux): eDVBDemux(adapter, demux), m_state(state_idle), m_mgr(mgr)
 {
 	if (frontend >= 0)
@@ -180,7 +182,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
 
 RESULT eDVBChannel::connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)
 {
-	connection = new eConnection(this, m_stateChanged.connect(stateChange));
+	connection = new eConnection((iDVBChannel*)this, m_stateChanged.connect(stateChange));
 	return 0;
 }
 
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index f6aae238..52dd9a07 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -8,7 +8,7 @@
 
 class eDVBChannel;
 
-class eDVBResourceManager: public virtual iDVBResourceManager
+class eDVBResourceManager: public iDVBResourceManager
 {
 	DECLARE_REF;
 	int avail, busy;
@@ -38,8 +38,10 @@ public:
 	RESULT removeChannel(const eDVBChannelID &chid, eDVBChannel *ch);
 };
 
-class eDVBChannel: public virtual iDVBChannel, public virtual eDVBDemux, public Object
+class eDVBChannel: public iDVBChannel, public eDVBDemux, public Object
 {
+	DECLARE_REF;
+private:
 	ePtr<eDVBFrontend> m_frontend;
 	ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
 	eDVBChannelID m_channel_id;
diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index ca63c184..78895e76 100644
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -4,7 +4,7 @@
 #include <lib/dvb/isection.h>
 #include <set>
 
-class eGTable: public virtual iObject, public Object
+class eGTable: public iObject, public Object
 {
 DECLARE_REF;
 private:
diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index ee7f945a..c179d574 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -3,7 +3,7 @@
 
 #include <lib/dvb/idvb.h>
 
-class eDVBFrontendParameters: public virtual iDVBFrontendParameters
+class eDVBFrontendParameters: public iDVBFrontendParameters
 {
 	DECLARE_REF;
 	union
@@ -30,7 +30,7 @@ public:
 	RESULT getHash(unsigned long &hash) const;
 };
 
-class eDVBFrontend: public virtual iDVBFrontend, public Object
+class eDVBFrontend: public iDVBFrontend, public Object
 {
 	DECLARE_REF;
 	int m_type;
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index c4ae488d..a69f170f 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -147,13 +147,13 @@ class iDVBChannel;
 class iDVBDemux;
 class iDVBFrontendParameters;
 
-class iDVBChannelList: public virtual iObject
+class iDVBChannelList: public iObject
 {
 public:
 	virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
 };
 
-class iDVBResourceManager: public virtual iObject
+class iDVBResourceManager: public iObject
 {
 public:
 	/*
@@ -214,7 +214,7 @@ struct eDVBFrontendParametersTerrestrial
 	void set(const TerrestrialDeliverySystemDescriptor  &);
 };
 
-class iDVBFrontendParameters: public virtual iObject
+class iDVBFrontendParameters: public iObject
 {
 public:
 	virtual RESULT getSystem(int &type) const = 0;
@@ -236,7 +236,7 @@ struct eDVBDiseqcCommand
 
 class iDVBSatelliteEquipmentControl;
 
-class iDVBFrontend: public virtual iObject
+class iDVBFrontend: public iObject
 {
 public:
 	enum {
@@ -275,7 +275,7 @@ struct eDVBCIRouting
 	int enabled;
 };
 
-class iDVBChannel: public virtual iObject
+class iDVBChannel: public iObject
 {
 public:
 	enum
@@ -302,7 +302,7 @@ public:
 class iDVBSectionReader;
 class iTSMPEGDecoder;
 
-class iDVBDemux: public virtual iObject
+class iDVBDemux: public iObject
 {
 public:
 	virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
diff --git a/lib/dvb/isection.h b/lib/dvb/isection.h
index 04b50f52..f44c1632 100644
--- a/lib/dvb/isection.h
+++ b/lib/dvb/isection.h
@@ -42,7 +42,7 @@ struct eDVBTableSpec
 	int flags;
 };
 
-class iDVBSectionReader: public virtual iObject
+class iDVBSectionReader: public iObject
 {
 public:
 	virtual RESULT start(const eDVBSectionFilterMask &mask)=0;
diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index cc727644..61a211ba 100644
--- a/lib/dvb/scan.h
+++ b/lib/dvb/scan.h
@@ -6,7 +6,7 @@
 #include <lib/dvb_si/bat.h>
 #include <lib/dvb/db.h>
 
-class eDVBScan: public Object, public virtual iObject
+class eDVBScan: public Object, public iObject
 {
 		/* chid helper functions: */