tuxbox-cvs-commits

[Thilo G. <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  c613583a8dbac3d7d39605ea76dee6003bd0fa33 (commit)
      from  37a8caceda0a043e234b974f6694f50734c5dca0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c613583a8dbac3d7d39605ea76dee6003bd0fa33
Author: GetAway <get...@t-...>
Date:   Tue Dec 31 13:36:07 2013 +0100

    enigma: port libsigc-1.2 to libsigc-2.0
    
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/enigma/boot/bootmenue/my_rc.h b/tuxbox/enigma/boot/bootmenue/my_rc.h
index d59d2d0..44a328f 100755
--- a/tuxbox/enigma/boot/bootmenue/my_rc.h
+++ b/tuxbox/enigma/boot/bootmenue/my_rc.h
@@ -68,7 +68,7 @@ class RcInput
 	static void* ThreadBu(void*);
 public:
 	static RcInput *getInstance();
-	Signal1<void,unsigned short> selected;
+	sigc::signal<void,unsigned short> selected;
 	RcInput();
 	~RcInput();
 };
diff --git a/tuxbox/enigma/boot/bootmenue/my_timer.h b/tuxbox/enigma/boot/bootmenue/my_timer.h
index 9271f98..dceee8b 100755
--- a/tuxbox/enigma/boot/bootmenue/my_timer.h
+++ b/tuxbox/enigma/boot/bootmenue/my_timer.h
@@ -15,7 +15,7 @@ class CTimer
 	static void* ThreadTimer(void*);
 public:
 	static CTimer *getInstance();
-	Signal0<void>selected;
+	sigc::signal<void>selected;
 	static void start(int val);
 	~CTimer();
 };
diff --git a/tuxbox/enigma/configure.ac b/tuxbox/enigma/configure.ac
index 37cdf33..7ca2e43 100644
--- a/tuxbox/enigma/configure.ac
+++ b/tuxbox/enigma/configure.ac
@@ -97,7 +97,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 TUXBOX_APPS_LIB_PKGCONFIG(MD5SUM,tuxbox-md5sum)
 TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)
 TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
-TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2)
+TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
 TUXBOX_APPS_LIB_PKGCONFIG(XMLTREE,tuxbox-xmltree)
 TUXBOX_APPS_LIB_PKGCONFIG(TUXTXT,tuxbox-tuxtxt)
 TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec)
diff --git a/tuxbox/enigma/include/lib/base/console.h b/tuxbox/enigma/include/lib/base/console.h
index 924b832..5f93b9e 100644
--- a/tuxbox/enigma/include/lib/base/console.h
+++ b/tuxbox/enigma/include/lib/base/console.h
@@ -16,7 +16,7 @@ struct queue_data
 	int len;
 };
 
-class eConsoleAppContainer: public Object
+class eConsoleAppContainer: public sigc::trackable
 {
 	int fd[3];
 	int pid;
@@ -36,9 +36,9 @@ public:
 	void sendCtrlC();
 	void write( const char *data, int len );
 	bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); }
-	Signal1<void, eString> dataAvail;
-	Signal1<void,int> dataSent;
-	Signal1<void,int> appClosed;
+	sigc::signal<void, eString> dataAvail;
+	sigc::signal<void,int> dataSent;
+	sigc::signal<void,int> appClosed;
 };
 
 #endif // __LIB_BASE_CONSOLE_H__
diff --git a/tuxbox/enigma/include/lib/base/ebase.h b/tuxbox/enigma/include/lib/base/ebase.h
index e9fb143..1ddfeb1 100644
--- a/tuxbox/enigma/include/lib/base/ebase.h
+++ b/tuxbox/enigma/include/lib/base/ebase.h
@@ -162,7 +162,7 @@ public:
 	eSocketNotifier(eMainloop *context, int fd, int req, bool startnow=true);
 	~eSocketNotifier();
 
-	Signal1<void, int> activated;
+	sigc::signal<void, int> activated;
 
 	void start();
 	void stop();
@@ -198,7 +198,7 @@ public:
 	eTimer(eMainloop *context): context(*context), bActive(false) { }
 	~eTimer() { if (bActive) stop(); }
 
-	Signal0<void> timeout;
+	sigc::signal<void> timeout;
 	void activate();
 
 	bool isActive() { return bActive; }
diff --git a/tuxbox/enigma/include/lib/base/eerror.h b/tuxbox/enigma/include/lib/base/eerror.h
index 1e52312..e041774 100644
--- a/tuxbox/enigma/include/lib/base/eerror.h
+++ b/tuxbox/enigma/include/lib/base/eerror.h
@@ -28,7 +28,7 @@ void eFatal(const char* fmt, ...);
 
 enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
 
-extern Signal2<void, int, const eString&> logOutput;
+extern sigc::signal<void, int, const eString&> logOutput;
 extern int logOutputConsole;
 
 #ifdef ASSERT
diff --git a/tuxbox/enigma/include/lib/base/message.h b/tuxbox/enigma/include/lib/base/message.h
index 0208da3..211a2a3 100644
--- a/tuxbox/enigma/include/lib/base/message.h
+++ b/tuxbox/enigma/include/lib/base/message.h
@@ -32,7 +32,7 @@ public:
  * Automatically creates a eSocketNotifier and gives you a callback.
  */
 template<class T>
-class eFixedMessagePump: private eMessagePump, public Object
+class eFixedMessagePump: private eMessagePump, public sigc::trackable
 {
 	eSocketNotifier *sn;
 	void do_recv(int)
@@ -42,7 +42,8 @@ class eFixedMessagePump: private eMessagePump, public Object
 		/*emit*/ recv_msg(msg);
 	}
 public:
-	Signal1<void,const T&> recv_msg;
+	sigc::signal<void, const T&> recv_msg;
+
 	void send(const T &msg)
 	{
 		eMessagePump::send(&msg, sizeof(msg));
diff --git a/tuxbox/enigma/include/lib/codecs/codec.h b/tuxbox/enigma/include/lib/codecs/codec.h
index d1308a6..dc08e7e 100644
--- a/tuxbox/enigma/include/lib/codecs/codec.h
+++ b/tuxbox/enigma/include/lib/codecs/codec.h
@@ -20,7 +20,7 @@ public:
 	eAudioDecoder();
 	virtual ~eAudioDecoder();
 
-	virtual int decodeMore(int last, int maxsamples, Signal1<void,unsigned int>*cb=0)=0; // returns number of samples(!) written to IOBuffer (out)
+	virtual int decodeMore(int last, int maxsamples, sigc::signal<void,unsigned int>*cb=0)=0; // returns number of samples(!) written to IOBuffer (out)
 	virtual void resync()=0; // clear (secondary) decoder buffers
 
 	struct pcmSettings
diff --git a/tuxbox/enigma/include/lib/codecs/codecmp3.h b/tuxbox/enigma/include/lib/codecs/codecmp3.h
index de41f98..a36842a 100644
--- a/tuxbox/enigma/include/lib/codecs/codecmp3.h
+++ b/tuxbox/enigma/include/lib/codecs/codecmp3.h
@@ -26,7 +26,7 @@ public:
 	
 	void resync();
 	int getMinimumFramelength();
-	int decodeMore(int last, int maxsamples, Signal1<void, unsigned int>*cb=0);
+	int decodeMore(int last, int maxsamples, sigc::signal<void, unsigned int>*cb=0);
 	int getAverageBitrate();
 };
 
diff --git a/tuxbox/enigma/include/lib/codecs/codecmpg.h b/tuxbox/enigma/include/lib/codecs/codecmpg.h
index c0adfec..d2326e3 100644
--- a/tuxbox/enigma/include/lib/codecs/codecmpg.h
+++ b/tuxbox/enigma/include/lib/codecs/codecmpg.h
@@ -46,7 +46,7 @@ public:
 	void extractSequenceHeader( unsigned char *buf, unsigned int len );
 	eDemux(eIOBuffer &input, eIOBuffer &video, eIOBuffer &audio, int fd, int sourcefd);
 	~eDemux();
-	virtual int decodeMore(int last, int maxsamples, Signal1<void, unsigned int>*newastreamid=0 )=0; // returns number of samples(!) written to IOBuffer (out)
+	virtual int decodeMore(int last, int maxsamples, sigc::signal<void, unsigned int>*newastreamid=0 )=0; // returns number of samples(!) written to IOBuffer (out)
 	void resync(); // clear (secondary) decoder buffers
 	int getMinimumFramelength();
 	int getAverageBitrate();
@@ -60,7 +60,7 @@ public:
 	eMPEGDemux(eIOBuffer &input, eIOBuffer &video, eIOBuffer &audio, int fd, int sourcefd)
 		:eDemux(input, video, audio, fd, sourcefd)
 	{}
-	int decodeMore(int last, int maxsamples, Signal1<void, unsigned int>*newastreamid=0 ); // returns number of samples(!) written to IOBuffer (out)
+	int decodeMore(int last, int maxsamples, sigc::signal<void, unsigned int>*newastreamid=0 ); // returns number of samples(!) written to IOBuffer (out)
 };
 
 // PVA demuxer.
@@ -70,7 +70,7 @@ public:
 	ePVADemux(eIOBuffer &input, eIOBuffer &video, eIOBuffer &audio, int fd, int sourcefd)
 		:eDemux(input, video, audio, fd, sourcefd)
 	{}
-	int decodeMore(int last, int maxsamples, Signal1<void, unsigned int>*newastreamid=0 ); // returns number of samples(!) written to IOBuffer (out)
+	int decodeMore(int last, int maxsamples, sigc::signal<void, unsigned int>*newastreamid=0 ); // returns number of samples(!) written to IOBuffer (out)
 };
 
 #endif
diff --git a/tuxbox/enigma/include/lib/codecs/codecogg.h b/tuxbox/enigma/include/lib/codecs/codecogg.h
index 76e9b42..9d514ba 100644
--- a/tuxbox/enigma/include/lib/codecs/codecogg.h
+++ b/tuxbox/enigma/include/lib/codecs/codecogg.h
@@ -29,7 +29,7 @@ public:
 	
 	void resync();
 	int getMinimumFramelength();
-	int decodeMore(int last, int maxsamples, Signal1<void, unsigned int>*cb=0);
+	int decodeMore(int last, int maxsamples, sigc::signal<void, unsigned int>*cb=0);
 	int getAverageBitrate();
 	void Init();
 };
diff --git a/tuxbox/enigma/include/lib/driver/audiodynamic.h b/tuxbox/enigma/include/lib/driver/audiodynamic.h
index b355aa6..770af49 100644
--- a/tuxbox/enigma/include/lib/driver/audiodynamic.h
+++ b/tuxbox/enigma/include/lib/driver/audiodynamic.h
@@ -1,7 +1,7 @@
 #ifndef __lib_driver_audiodynamic_h
 #define __lib_driver_audiodynamic_h
 
-class eAudioDynamicCompression: public Object
+class eAudioDynamicCompression: public sigc::trackable
 {
 	struct arg_s
 	{
diff --git a/tuxbox/enigma/include/lib/driver/eavswitch.h b/tuxbox/enigma/include/lib/driver/eavswitch.h
index d13339d..fbaff72 100644
--- a/tuxbox/enigma/include/lib/driver/eavswitch.h
+++ b/tuxbox/enigma/include/lib/driver/eavswitch.h
@@ -47,7 +47,7 @@ protected:
 public:
 	eAVSwitch();
 	~eAVSwitch();
-	Signal2<void, int, int> volumeChanged;
+	sigc::signal<void, int, int> volumeChanged;
 
 	static eAVSwitch *getInstance();
 	int getVolume() { return volume; }
diff --git a/tuxbox/enigma/include/lib/driver/rc.h b/tuxbox/enigma/include/lib/driver/rc.h
index 3233224..d5a135e 100644
--- a/tuxbox/enigma/include/lib/driver/rc.h
+++ b/tuxbox/enigma/include/lib/driver/rc.h
@@ -24,7 +24,7 @@ class eRCKey;
  *
  * Handles one remote control. Gets codes from a \ref eRCDriver. Produces events in \ref eRCInput.
  */
-class eRCDevice: public Object
+class eRCDevice: public sigc::trackable
 {
 protected:
 	eRCInput *input;
@@ -76,7 +76,7 @@ public:
 /**
  * Receives codes from one or more remote controls.
  */
-class eRCDriver: public Object
+class eRCDriver: public sigc::trackable
 {
 protected:
 	std::list<eRCDevice*> listeners;
@@ -222,7 +222,7 @@ public:
 		rrate;		// repeat rate (in ms)
 };
 
-class eRCInput: public Object
+class eRCInput: public sigc::trackable
 {
 	int locked;	
 	int handle;
@@ -240,7 +240,8 @@ public:
 protected:
 	std::map<eString,eRCDevice*,lstr> devices;
 public:
-	Signal1<void, const eRCKey&> keyEvent;
+	//Signal1<void, const eRCKey&> keyEvent;
+	sigc::signal<void, const eRCKey&> keyEvent;
 	eRCInput();
 	~eRCInput();
 	
diff --git a/tuxbox/enigma/include/lib/driver/streamwd.h b/tuxbox/enigma/include/lib/driver/streamwd.h
index 50dd70a..c72bbad 100644
--- a/tuxbox/enigma/include/lib/driver/streamwd.h
+++ b/tuxbox/enigma/include/lib/driver/streamwd.h
@@ -6,7 +6,7 @@
 #include <lib/dvb/si.h>
 #include <lib/dvb/dvb.h>
 
-class eStreamWatchdog: public Object
+class eStreamWatchdog: public sigc::trackable
 {
 	eSocketNotifier* sn;
 	int handle;
@@ -22,8 +22,8 @@ public:
 	~eStreamWatchdog();
 	static eStreamWatchdog *getInstance();
 	int isAnamorph();
-	Signal1<void, int> AspectRatioChanged;
-	Signal1<void, int> VCRActivityChanged;
+	sigc::signal<void, int> AspectRatioChanged;
+	sigc::signal<void, int> VCRActivityChanged;
 };
 
 #endif
diff --git a/tuxbox/enigma/include/lib/dvb/dvb.h b/tuxbox/enigma/include/lib/dvb/dvb.h
index b7ef5e8..4a6797f 100644
--- a/tuxbox/enigma/include/lib/dvb/dvb.h
+++ b/tuxbox/enigma/include/lib/dvb/dvb.h
@@ -835,7 +835,7 @@ protected:
 	int addNetwork(tpPacket &p, XMLTreeNode *node, int type);
 };
 
-class eTransponderList: public existNetworks, public Object
+class eTransponderList: public existNetworks, public sigc::trackable
 {
 public:
 	enum { SDT_SCAN_FREE, SDT_SCAN, SDT_SCAN_FINISHED, PAT_SCAN };
@@ -853,7 +853,7 @@ private:
 	eServiceReferenceDVB newService;
 	ePtrList<SDTEntry>::const_iterator curSDTEntry;
 	ePtrList<PATEntry>::const_iterator curPATEntry;
-	Signal0<void> *callback;
+	sigc::signal<void> *callback;
 	std::set<eServiceID> newServiceIds;
 	std::set<eServiceID> checkedServiceIds;
 	int sdtscanstate;
@@ -894,11 +894,11 @@ public:
 	eTransponder &createTransponder(eDVBNamespace dvb_namespace,eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id);
 	eServiceDVB &createService(const eServiceReferenceDVB &service, int service_number=-1, bool *newService=0);
 	eServiceDVB &createSubService(const eServiceReferenceDVB &service, bool *newService=0);
-	void startHandleSDT(const SDT *sdt, eDVBNamespace dvb_namespace, eOriginalNetworkID onid=-1, eTransportStreamID tsid=-1, Signal0<void> *callback=0, int sdtscanstate=SDT_SCAN );
-	void handleSDT(const SDT *sdt, eDVBNamespace dvb_namespace, eOriginalNetworkID onid=-1, eTransportStreamID tsid=-1, Signal0<void> *callback=0 );
-	Signal1<void, eTransponder*> transponder_added;
-	Signal2<void, const eServiceReferenceDVB &, bool> service_found;
-	Signal1<void, const eServiceReferenceDVB &> service_removed;
+	void startHandleSDT(const SDT *sdt, eDVBNamespace dvb_namespace, eOriginalNetworkID onid=-1, eTransportStreamID tsid=-1, sigc::signal<void> *callback=0, int sdtscanstate=SDT_SCAN );
+	void handleSDT(const SDT *sdt, eDVBNamespace dvb_namespace, eOriginalNetworkID onid=-1, eTransportStreamID tsid=-1, sigc::signal<void> *callback=0 );
+	sigc::signal<void, eTransponder*> transponder_added;
+	sigc::signal<void, const eServiceReferenceDVB &, bool> service_found;
+	sigc::signal<void, const eServiceReferenceDVB &> service_removed;
 
 	eTransponder *searchTransponder(const eTransponder &);
 	eTransponder *searchTS(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id);
diff --git a/tuxbox/enigma/include/lib/dvb/dvbci.h b/tuxbox/enigma/include/lib/dvb/dvbci.h
index 93c37e0..65992e5 100644
--- a/tuxbox/enigma/include/lib/dvb/dvbci.h
+++ b/tuxbox/enigma/include/lib/dvb/dvbci.h
@@ -73,7 +73,7 @@ struct _lpduQueueHeader
 
 #define CIServiceMap std::map<int, std::list<tempPMT_t> >
 
-class eDVBCI: private eThread, public eMainloop, public Object
+class eDVBCI: private eThread, public eMainloop, public sigc::trackable
 {
 	static int instance_count;
 	std::priority_queue<queueData> sendqueue;
@@ -193,7 +193,7 @@ public:
 	~eDVBCI();
 	
 	void thread();
-	Signal1<void, const char*> ci_progress;
-	Signal2<void, const char*, int> ci_mmi_progress;
+	sigc::signal<void, const char*> ci_progress;
+	sigc::signal<void, const char*, int> ci_mmi_progress;
 };
 #endif
diff --git a/tuxbox/enigma/include/lib/dvb/dvbscan.h b/tuxbox/enigma/include/lib/dvb/dvbscan.h
index f2237ff..eff3630 100644
--- a/tuxbox/enigma/include/lib/dvb/dvbscan.h
+++ b/tuxbox/enigma/include/lib/dvb/dvbscan.h
@@ -42,7 +42,7 @@ public:
 	eDVBScanState(int state): eDVBState(state) { }
 };
 
-class eDVBScanController: public eDVBController, public Object
+class eDVBScanController: public eDVBController, public sigc::trackable
 {
 	int flags;
 	
@@ -65,7 +65,7 @@ class eDVBScanController: public eDVBController, public Object
 	void handleSDT(const SDT *sdt);
 
 	void freeCheckFinished();
-	Signal0<void> freeCheckFinishedCallback;
+	sigc::signal<void> freeCheckFinishedCallback;
 	void init_eDVBScanController(eDVB &dvb);
 public:
 	bool abort();
diff --git a/tuxbox/enigma/include/lib/dvb/dvbservice.h b/tuxbox/enigma/include/lib/dvb/dvbservice.h
index 412bfae..fc52cc6 100644
--- a/tuxbox/enigma/include/lib/dvb/dvbservice.h
+++ b/tuxbox/enigma/include/lib/dvb/dvbservice.h
@@ -112,9 +112,9 @@ public:
 };
 
 class eDVBServiceController
-	:public eDVBController, public eDVBCaPMTClient, public Object
+	:public eDVBController, public eDVBCaPMTClient, public sigc::trackable
 {
-	Signal0<void> freeCheckFinishedCallback;
+	sigc::signal<void> freeCheckFinishedCallback;
 	void freeCheckFinished();
 // for linkage handling
 	eServiceReferenceDVB parentservice,prevservice;
diff --git a/tuxbox/enigma/include/lib/dvb/dvbwidgets.h b/tuxbox/enigma/include/lib/dvb/dvbwidgets.h
index 658f217..bbcb0ff 100644
--- a/tuxbox/enigma/include/lib/dvb/dvbwidgets.h
+++ b/tuxbox/enigma/include/lib/dvb/dvbwidgets.h
@@ -34,7 +34,7 @@ public:
 	{
 		deliveryCable=1, deliverySatellite=2, deliveryTerrestrial=4, flagNoSat=8, flagNoInv=16
 	};
-	Signal0<void> updated;
+	sigc::signal<void> updated;
 	eTransponderWidget(eWidget *parent, int edit, int type);
 	int load();
 	int setTransponder(const eTransponder *transponder);
diff --git a/tuxbox/enigma/include/lib/dvb/edvb.h b/tuxbox/enigma/include/lib/dvb/edvb.h
index 70b7e48..2101a75 100644
--- a/tuxbox/enigma/include/lib/dvb/edvb.h
+++ b/tuxbox/enigma/include/lib/dvb/edvb.h
@@ -109,7 +109,7 @@ public:
  * "switchService" which can be called almost 
  * stateless from everywhere...
  */
-class eDVB: public Object
+class eDVB: public sigc::trackable
 {
 	static eDVB *instance;
 	void init_eDVB();
@@ -129,10 +129,10 @@ public:
 	eAUTable<BAT> tBAT;
 	EIT *parentEIT;
 
-	Signal2<void, EIT*, int> gotEIT;
-	Signal1<void, SDT*> gotSDT;
-	Signal1<void, PMT*> gotPMT;
-	Signal1<void, int> gotContentPid;
+	sigc::signal<void, EIT*, int> gotEIT;
+	sigc::signal<void, SDT*> gotSDT;
+	sigc::signal<void, PMT*> gotPMT;
+	sigc::signal<void, int> gotContentPid;
 
 	// use from external classes to get PMT/EIT/SDT ... for refcounting
 	PMT *getPMT();
@@ -176,18 +176,18 @@ public:
 	const eDVBState &getState() const { return state; }
 	void setState(const eDVBState &newstate) { /*emit*/ stateChanged(state=newstate); }
 	void event(const eDVBEvent &event);
-	Signal1<void, const eDVBState&> stateChanged;
-	Signal1<void, const eDVBEvent&> eventOccured;
-
-	Signal1<void, bool> scrambled;
-	Signal0<void> serviceListChanged;
-	Signal0<void> bouquetListChanged;
-	Signal1<void, const eServiceReferenceDVB &> leaveService;
-	Signal1<void, const eServiceReferenceDVB &> enterService;
-	Signal1<void, eTransponder*> leaveTransponder;
-	Signal1<void, eTransponder*> enterTransponder;
-	Signal2<void, eTransponder*, int> switchedTransponder;
-	Signal2<void, const eServiceReferenceDVB &, int> switchedService;
+	sigc::signal<void, const eDVBState&> stateChanged;
+	sigc::signal<void, const eDVBEvent&> eventOccured;
+
+	sigc::signal<void, bool> scrambled;
+	sigc::signal<void> serviceListChanged;
+	sigc::signal<void> bouquetListChanged;
+	sigc::signal<void, const eServiceReferenceDVB &> leaveService;
+	sigc::signal<void, const eServiceReferenceDVB &> enterService;
+	sigc::signal<void, eTransponder*> leaveTransponder;
+	sigc::signal<void, eTransponder*> enterTransponder;
+	sigc::signal<void, eTransponder*, int> switchedTransponder;
+	sigc::signal<void, const eServiceReferenceDVB &, int> switchedService;
 
 /////////////////////////Scan and Service Controller////////////////////////////
 public:
@@ -216,7 +216,7 @@ public:
 
 	/* container for settings */
 	eDVBSettings *settings;
-	Signal0<void> timeUpdated;
+	sigc::signal<void> timeUpdated;
 	int time_difference;
 };
 
diff --git a/tuxbox/enigma/include/lib/dvb/epgcache.h b/tuxbox/enigma/include/lib/dvb/epgcache.h
index 78e1919..06f89bd 100644
--- a/tuxbox/enigma/include/lib/dvb/epgcache.h
+++ b/tuxbox/enigma/include/lib/dvb/epgcache.h
@@ -267,7 +267,7 @@ class ePrivateContent: public eSection
 };
 #endif
 
-class eEPGCache: public eMainloop, private eThread, public Object
+class eEPGCache: public eMainloop, private eThread, public sigc::trackable
 {
 public:
 #ifdef ENABLE_MHW_EPG
@@ -417,8 +417,8 @@ public:
 	bool CheckBouquets(uniqueEPGKey &key);
 	inline void ClearCache() { flushEPG(); }
 
-	Signal1<void, bool> EPGAvail;
-	Signal0<void> EPGUpdated;
+	sigc::signal<void, bool> EPGAvail;
+	sigc::signal<void> EPGUpdated;
 };
 
 inline const std::list<NVODReferenceEntry>* eEPGCache::getNVODRefList(const eServiceReferenceDVB &service)
diff --git a/tuxbox/enigma/include/lib/dvb/esection.h b/tuxbox/enigma/include/lib/dvb/esection.h
index 2c0c417..351cee0 100644
--- a/tuxbox/enigma/include/lib/dvb/esection.h
+++ b/tuxbox/enigma/include/lib/dvb/esection.h
@@ -35,7 +35,7 @@ public:
 	int read(__u8 *data);
 };
 
-class eSection: public Object
+class eSection: public sigc::trackable
 {
 	eMainloop *context;
 	eSectionReader reader;
@@ -78,7 +78,7 @@ class eTable: public eSection
 protected:
 	virtual int data(__u8 *data)=0;
 public:
-	Signal1<void, int> tableReady;
+	sigc::signal<void, int> tableReady;
 	eTable(int pid, int tableid, int tableidext=-1, int version=-1);
 	eTable(int pid, int tableid, int tableidmask, int tableidext, int version);
 	eTable();
@@ -89,13 +89,13 @@ public:
 	int ready;
 };
 
-class eAUGTable: public Object
+class eAUGTable: public sigc::trackable
 {
 protected:
 	eString dmxdev;
 	void slotTableReady(int);
 public:
-	Signal1<void, int> tableReady;
+	sigc::signal<void, int> tableReady;
 	virtual void getNext(int err)=0;
 };
 
diff --git a/tuxbox/enigma/include/lib/dvb/frontend.h b/tuxbox/enigma/include/lib/dvb/frontend.h
index 5c3f695..fbdf1db 100644
--- a/tuxbox/enigma/include/lib/dvb/frontend.h
+++ b/tuxbox/enigma/include/lib/dvb/frontend.h
@@ -71,7 +71,7 @@ struct eSecCmdSequence
  *
  * A frontend is something like a tuner. You can tune to a transponder (or channel, as called with DVB-C).
  */
-class eFrontend: public Object
+class eFrontend: public sigc::trackable
 {
 	int type,
 			fd,
@@ -99,7 +99,7 @@ class eFrontend: public Object
 				checkRotorLockTimer, checkLockTimer, updateTransponderTimer;
 	eSocketNotifier *sn;
 	int tries, noRotorCmd, wasLoopthrough, lostlockcount;
-	Signal1<void, eTransponder*> tpChanged;
+	sigc::signal<void, eTransponder*> tpChanged;
 // ROTOR INPUTPOWER
 	timeval rotorTimeout;
 	int idlePowerInput;
@@ -139,9 +139,9 @@ public:
 	void enableRotor() { noRotorCmd = 0, lastRotorCmd=-1; }  // rotor cmd is sent when tune
 	int sendDiSEqCCmd( int addr, int cmd, eString params="", int frame=0xE0 );
 
-	Signal1<void, int> s_RotorRunning;
-	Signal0<void> s_RotorStopped, s_RotorTimeout;
-	Signal2<void, eTransponder*, int> tunedIn;
+	sigc::signal<void, int> s_RotorRunning;
+	sigc::signal<void> s_RotorStopped, s_RotorTimeout;
+	sigc::signal<void, eTransponder*, int> tunedIn;
 	~eFrontend();
 
 	static int open(int type)
diff --git a/tuxbox/enigma/include/lib/dvb/record.h b/tuxbox/enigma/include/lib/dvb/record.h
index a529ca8..953d58b 100644
--- a/tuxbox/enigma/include/lib/dvb/record.h
+++ b/tuxbox/enigma/include/lib/dvb/record.h
@@ -32,7 +32,7 @@
  * \todo Howto disable this warning?
  */
 
-class eDVBRecorder: private eThread, public Object
+class eDVBRecorder: private eThread, public sigc::trackable
 {
 	enum { stateRunning = 1, stateStopped = 0, stateError = 2 }state;
 	struct eDVBRecorderMessage
@@ -174,7 +174,7 @@ public:
 	void validatePIDs();
 
 	enum { recWriteError };
-	Signal1<void,int> recMessage;
+	sigc::signal<void,int> recMessage;
 	eServiceReferenceDVB recRef;
 	bool scrambled;
 	void SetSlice(int slice);
diff --git a/tuxbox/enigma/include/lib/dvb/service.h b/tuxbox/enigma/include/lib/dvb/service.h
index 7f67a5c..9f21882 100644
--- a/tuxbox/enigma/include/lib/dvb/service.h
+++ b/tuxbox/enigma/include/lib/dvb/service.h
@@ -77,7 +77,7 @@ class PMT;
 class SDT;
 class PMTEntry;
 
-class eServiceHandler: public Object
+class eServiceHandler: public sigc::trackable
 {
 protected:
 	int id;
@@ -145,10 +145,10 @@ public:
 			// simple "info" functions..
 	virtual eString getInfo(int id); // 0: status, 1+2 upper/lower line :)
 
-	Signal1<void, const eServiceEvent &> serviceEvent;
+	sigc::signal<void, const eServiceEvent &> serviceEvent;
 
 		// service list functions
-	virtual void enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback);
+	virtual void enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback);
 	virtual void leaveDirectory(const eServiceReference &dir);
 
 	virtual eService *addRef(const eServiceReference &service);
@@ -157,13 +157,13 @@ public:
 
 class eService;
 
-class eServiceInterface: public Object
+class eServiceInterface: public sigc::trackable
 {
 	eServiceHandler *currentServiceHandler;
 	std::map<int,eServiceHandler*> handlers;
 	int switchServiceHandler(int id, int workaround=0);
 	
-	SigC::Connection conn;
+	sigc::connection conn;
 	void handleServiceEvent(const eServiceEvent &event);
 	
 	static eServiceInterface *instance;
@@ -180,7 +180,7 @@ public:
 	int play(const eServiceReference &service, int workaround );
 
 		// service related functions
-	Signal1<void,const eServiceEvent &> serviceEvent;
+	sigc::signal<void,const eServiceEvent &> serviceEvent;
 
 	eServiceHandler *getService()
 	{
@@ -192,7 +192,7 @@ public:
 	eServiceReference service;
 		
 		// service list functions
-	void enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback);
+	void enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback);
 	void leaveDirectory(const eServiceReference &dir);
 	
 		// stuff for modifiying ...
diff --git a/tuxbox/enigma/include/lib/dvb/servicecache.h b/tuxbox/enigma/include/lib/dvb/servicecache.h
index b80af67..14b3003 100644
--- a/tuxbox/enigma/include/lib/dvb/servicecache.h
+++ b/tuxbox/enigma/include/lib/dvb/servicecache.h
@@ -41,7 +41,7 @@ private:
 public:
 	eServiceCacheBase(){};
 	virtual ~eServiceCacheBase(){};
-	void enterDirectory(const eServiceReference &parent, Signal1<void, const eServiceReference&> &callback);
+	void enterDirectory(const eServiceReference &parent, sigc::signal<void, const eServiceReference&> &callback);
 	void leaveDirectory(const eServiceReference &parent);
 	void addPersistentService(const eServiceReference &serviceref, eService *service);
 	eService *addRef(const eServiceReference &serviceref);
diff --git a/tuxbox/enigma/include/lib/dvb/servicedvb.h b/tuxbox/enigma/include/lib/dvb/servicedvb.h
index 1b0e39a..e08ae31 100644
--- a/tuxbox/enigma/include/lib/dvb/servicedvb.h
+++ b/tuxbox/enigma/include/lib/dvb/servicedvb.h
@@ -41,7 +41,7 @@ public:
 	eString getTimeshiftPath();
 };
 
-class eDVRPlayerThread: public eThread, public eMainloop, public Object
+class eDVRPlayerThread: public eThread, public eMainloop, public sigc::trackable
 {
 	eServiceHandlerDVB *handler;
 	eIOBuffer buffer;
@@ -199,7 +199,7 @@ public:
 	void addFile(void *node, const eString &filename);
 #endif
 
-	void enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback);
+	void enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback);
 	void leaveDirectory(const eServiceReference &dir);
 
 	eService *addRef(const eServiceReference &service);
diff --git a/tuxbox/enigma/include/lib/dvb/serviceexternal.h b/tuxbox/enigma/include/lib/dvb/serviceexternal.h
index 141e06d..9cefffc 100644
--- a/tuxbox/enigma/include/lib/dvb/serviceexternal.h
+++ b/tuxbox/enigma/include/lib/dvb/serviceexternal.h
@@ -41,7 +41,7 @@ public:
 	static eServiceHandlerExternal *getInstance() { return instance; }
 };
 
-class ePlayerThread: public eThread, public Object
+class ePlayerThread: public eThread, public sigc::trackable
 {
 	eFixedMessagePump<int> message;
 	eString command;
diff --git a/tuxbox/enigma/include/lib/dvb/servicefile.h b/tuxbox/enigma/include/lib/dvb/servicefile.h
index 43c77fe..db45495 100644
--- a/tuxbox/enigma/include/lib/dvb/servicefile.h
+++ b/tuxbox/enigma/include/lib/dvb/servicefile.h
@@ -12,7 +12,7 @@ class eServiceFileHandler: public eServiceHandler
 	eServiceReference result;
 public:
 
-	Signal2<void,void*,const eString &> fileHandlers, directoryHandlers;
+	sigc::signal<void,void*,const eString &> fileHandlers, directoryHandlers;
 	void addReference(void *node, const eServiceReference &ref);
 	
 	static eServiceFileHandler *getInstance() { return instance; }
@@ -23,7 +23,7 @@ public:
 	~eServiceFileHandler();
 
 		// service list functions
-	void enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback);
+	void enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback);
 	void leaveDirectory(const eServiceReference &dir);
 
 	int deleteService(const eServiceReference &dir, const eServiceReference &ref);
diff --git a/tuxbox/enigma/include/lib/dvb/servicemp3.h b/tuxbox/enigma/include/lib/dvb/servicemp3.h
index 0e4ea35..b947359 100644
--- a/tuxbox/enigma/include/lib/dvb/servicemp3.h
+++ b/tuxbox/enigma/include/lib/dvb/servicemp3.h
@@ -27,11 +27,11 @@ public:
 	eHTTPStream(eHTTPConnection *c, eIOBuffer &buffer);
 	~eHTTPStream();
 	void haveData(void *data, int len);
-	Signal0<void> dataAvailable;
-	Signal1<void,eString> metaDataUpdated;
+	sigc::signal<void> dataAvailable;
+	sigc::signal<void,eString> metaDataUpdated;
 };
 
-class eMP3Decoder: public eThread, public eMainloop, public Object
+class eMP3Decoder: public eThread, public eMainloop, public sigc::trackable
 {
 	eServiceHandlerMP3 *handler;
 	eAudioDecoder *audiodecoder;
diff --git a/tuxbox/enigma/include/lib/dvb/serviceplaylist.h b/tuxbox/enigma/include/lib/dvb/serviceplaylist.h
index 3e9d650..7e368a7 100644
--- a/tuxbox/enigma/include/lib/dvb/serviceplaylist.h
+++ b/tuxbox/enigma/include/lib/dvb/serviceplaylist.h
@@ -129,7 +129,7 @@ public:
 	~eServicePlaylistHandler();
 
 		// service list functions
-	void enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback);
+	void enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback);
 	void leaveDirectory(const eServiceReference &dir);
 
 	eService *addRef(const eServiceReference &service);
diff --git a/tuxbox/enigma/include/lib/dvb/servicestructure.h b/tuxbox/enigma/include/lib/dvb/servicestructure.h
index 7cc6d4a..feb1357 100644
--- a/tuxbox/enigma/include/lib/dvb/servicestructure.h
+++ b/tuxbox/enigma/include/lib/dvb/servicestructure.h
@@ -16,7 +16,7 @@ public:
 	~eServiceStructureHandler();
 
 		// service list functions
-	void enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback);
+	void enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback);
 	void leaveDirectory(const eServiceReference &dir);
 	eService* addRef(const eServiceReference&);
 	void removeRef(const eServiceReference&);
diff --git a/tuxbox/enigma/include/lib/dvb/settings.h b/tuxbox/enigma/include/lib/dvb/settings.h
index ea145d6..e9e5feb 100644
--- a/tuxbox/enigma/include/lib/dvb/settings.h
+++ b/tuxbox/enigma/include/lib/dvb/settings.h
@@ -6,7 ...
 
[truncated message content]