- new GUI lib

 - fixes

6 files changed, 14 insertions, 14 deletions

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 9eeb07c8..253f8c3b 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -134,20 +134,20 @@ public:
 	}
 };
 
-class iServiceInformation: public virtual iObject
+class iServiceInformation: public iObject
 {
 public:
 	virtual RESULT getName(eString &name)=0;
 };
 
-class iPauseableService: public virtual iObject
+class iPauseableService: public iObject
 {
 public:
 	virtual RESULT pause()=0;
 	virtual RESULT unpause()=0;
 };
 
-class iPlayableService: public virtual iObject
+class iPlayableService: public iObject
 {
 	friend class iServiceHandler;
 public:
@@ -163,20 +163,20 @@ public:
 	virtual RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr)=0;
 };
 
-class iRecordableService: public virtual iObject
+class iRecordableService: public iObject
 {
 public:
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
 };
 
-class iListableService: public virtual iObject
+class iListableService: public iObject
 {
 public:
 	virtual RESULT getContent(std::list<eServiceReference> &list)=0;
 };
 
-class iServiceHandler: public virtual iObject
+class iServiceHandler: public iObject
 {
 public:
 	virtual RESULT play(const eServiceReference &, ePtr<iPlayableService> &ptr)=0;
diff --git a/lib/service/service.h b/lib/service/service.h
index f32e23d9..bd40fb08 100644
--- a/lib/service/service.h
+++ b/lib/service/service.h
@@ -5,7 +5,7 @@
 #include <lib/base/object.h>
 #include <lib/service/iservice.h>
 
-class eServiceCenter: public virtual iServiceHandler, public virtual iObject
+class eServiceCenter: public iServiceHandler
 {
 DECLARE_REF;
 private:
diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 1de4586c..6e901483 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,7 +6,7 @@
 
 #include <lib/dvb/pmt.h>
 
-class eServiceFactoryDVB: public virtual iServiceHandler, public virtual iObject
+class eServiceFactoryDVB: public iServiceHandler
 {
 DECLARE_REF;
 public:
@@ -20,7 +20,7 @@ public:
 	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
 };
 
-class eDVBServicePlay: public virtual iPlayableService, public virtual iObject, public Object, public virtual iServiceInformation
+class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
 {
 DECLARE_REF;
 private:
diff --git a/lib/service/servicefs.h b/lib/service/servicefs.h
index 9d49b42d..f98cbc4c 100644
--- a/lib/service/servicefs.h
+++ b/lib/service/servicefs.h
@@ -3,7 +3,7 @@
 
 #include <lib/service/iservice.h>
 
-class eServiceFactoryFS: public virtual iServiceHandler, public virtual iObject
+class eServiceFactoryFS: public iServiceHandler
 {
 DECLARE_REF;
 public:
@@ -17,7 +17,7 @@ public:
 	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
 };
 
-class eServiceFS: public virtual iListableService, public virtual iObject
+class eServiceFS: public iListableService
 {
 DECLARE_REF;
 private:
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 0ff36db0..105ffbfa 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -75,7 +75,7 @@ DEFINE_REF(eServiceMP3);
 
 RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 {
-	connection = new eConnection(this, m_event.connect(event));
+	connection = new eConnection((iPlayableService*)this, m_event.connect(event));
 	return 0;
 }
 
diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index d51207ff..940e141d 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -3,7 +3,7 @@
 
 #include <lib/service/iservice.h>
 
-class eServiceFactoryMP3: public virtual iServiceHandler, public virtual iObject
+class eServiceFactoryMP3: public iServiceHandler
 {
 DECLARE_REF;
 public:
@@ -17,7 +17,7 @@ public:
 	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
 };
 
-class eServiceMP3: public virtual iPlayableService, public virtual iPauseableService, public virtual iServiceInformation, public virtual iObject, public Object
+class eServiceMP3: public iPlayableService, public iPauseableService, public iServiceInformation, public Object
 {
 DECLARE_REF;
 private: