[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-401-gc613583
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-401-gc613583
|
From: Thilo G. <tux...@ne...> - 2014-07-11 20:25:25
|
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 +6,7 @@
class eDVB;
-class eDVBSettings: public Object
+class eDVBSettings: public sigc::trackable
{
eDVB &dvb;
std::map<eString, eBouquet*> bouquet_name_map;
diff --git a/tuxbox/enigma/include/lib/gui/actions.h b/tuxbox/enigma/include/lib/gui/actions.h
index 5053444..2c5ff47 100644
--- a/tuxbox/enigma/include/lib/gui/actions.h
+++ b/tuxbox/enigma/include/lib/gui/actions.h
@@ -62,7 +62,7 @@ public:
keys[style].insert(key);
}
eAction* setDescription(char *desc) { description = desc; return this;}
- Signal0<void> handler;
+ sigc::signal<void> handler;
// keylist &getKeyList();
int containsKey(const eRCKey &key, const eString& style ) const;
diff --git a/tuxbox/enigma/include/lib/gui/combobox.h b/tuxbox/enigma/include/lib/gui/combobox.h
index e2991b2..ffe601d 100644
--- a/tuxbox/enigma/include/lib/gui/combobox.h
+++ b/tuxbox/enigma/include/lib/gui/combobox.h
@@ -23,8 +23,8 @@ public:
~eComboBox();
void setOpenWidth( int w ) { listbox.resize( eSize(w, listbox.getSize().height()) ); }
enum { OK = 0, ERROR=1, E_ALLREADY_SELECTED = 2, E_COULDNT_FIND = 4, E_INVALID_ENTRY = 8 };
- Signal1< void, eListBoxEntryText* > selchanged;
- Signal2< void, eComboBox*, eListBoxEntryText* > selchanged_id;
+ sigc::signal< void, eListBoxEntryText* > selchanged;
+ sigc::signal< void, eComboBox*, eListBoxEntryText* > selchanged_id;
enum { /*flagVCenter=64 in eLabel*/ flagSorted=128, flagShowEntryHelp=256 };
eComboBox(eWidget* parent, int OpenEntries=5, eLabel* desc=0, int takefocus=1, const char *deco="eComboBox" );
void takeEntry( eListBoxEntryText* );
diff --git a/tuxbox/enigma/include/lib/gui/ebutton.h b/tuxbox/enigma/include/lib/gui/ebutton.h
index afcb114..d0b5ef0 100644
--- a/tuxbox/enigma/include/lib/gui/ebutton.h
+++ b/tuxbox/enigma/include/lib/gui/ebutton.h
@@ -32,8 +32,8 @@ public:
*
* This signals is emitted when OK is pressed.
*/
- Signal0<void> selected;
- Signal1<void, eButton*> selected_id;
+ sigc::signal<void> selected;
+ sigc::signal<void, eButton*> selected_id;
};
#endif
diff --git a/tuxbox/enigma/include/lib/gui/echeckbox.h b/tuxbox/enigma/include/lib/gui/echeckbox.h
index d2ecf1b..5278b29 100644
--- a/tuxbox/enigma/include/lib/gui/echeckbox.h
+++ b/tuxbox/enigma/include/lib/gui/echeckbox.h
@@ -16,7 +16,7 @@ private:
bool swapTxtPixmap;
void init_eCheckbox(int checked);
public:
- Signal1<void, int> checked;
+ sigc::signal<void, int> checked;
eCheckbox(eWidget *parent, int checked=0, int takefocus=1, bool swapTxtPixmap=false, const char *deco="eCheckBox" );
~eCheckbox();
void setCheck(int c);
diff --git a/tuxbox/enigma/include/lib/gui/enumber.h b/tuxbox/enigma/include/lib/gui/enumber.h
index 00f1cb6..165d1ed 100644
--- a/tuxbox/enigma/include/lib/gui/enumber.h
+++ b/tuxbox/enigma/include/lib/gui/enumber.h
@@ -39,8 +39,8 @@ public:
static void unpack(__u32 l, int *t);
static void pack(__u32 &l, int *t);
void invalidateNum();
- Signal1<void, int*> selected;
- Signal0<void> numberChanged;
+ sigc::signal<void, int*> selected;
+ sigc::signal<void> numberChanged;
eNumber(eWidget *parent, int len, int min, int max, int maxdigits, int *init, int isactive=0, eWidget* descr=0, int grabfocus=1, const char* deco="eNumber" );
~eNumber();
int getNumber(int f) { if ((f>=0) && (f<len)) return number[f]; return -1; }
diff --git a/tuxbox/enigma/include/lib/gui/ewidget.h b/tuxbox/enigma/include/lib/gui/ewidget.h
index 000cc30..60335d4 100644
--- a/tuxbox/enigma/include/lib/gui/ewidget.h
+++ b/tuxbox/enigma/include/lib/gui/ewidget.h
@@ -72,7 +72,7 @@ public:
/** \brief The main widget class. All widgets inherit this class.
* eWidget handles focus management.
*/
-class eWidget: public Object
+class eWidget: public sigc::trackable
{
enum
{
@@ -115,9 +115,9 @@ public:
* used from a existing statusbar.
* \sa eWidget::focusChanged
*/
- Signal1<void, const eWidget*> focusChanged;
- static Signal2< void, ePtrList<eAction>*, int > showHelp;
- static Signal1<void, const eWidget*> globalFocusChanged;
+ sigc::signal<void, const eWidget*> focusChanged;
+ static sigc::signal< void, ePtrList<eAction>*, int > showHelp;
+ static sigc::signal<void, const eWidget*> globalFocusChanged;
protected:
ePtrList<eAction> actionHelpList;
int helpID;
diff --git a/tuxbox/enigma/include/lib/gui/listbox.h b/tuxbox/enigma/include/lib/gui/listbox.h
index 6609e21..a055205 100644
--- a/tuxbox/enigma/include/lib/gui/listbox.h
+++ b/tuxbox/enigma/include/lib/gui/listbox.h
@@ -100,8 +100,8 @@ class eListBox: public eListBoxBase
/*emit*/ selchanged((T*)entry);
}
public:
- Signal1<void, T*> selected;
- Signal1<void, T*> selchanged;
+ sigc::signal<void, T*> selected;
+ sigc::signal<void, T*> selchanged;
eListBox(eWidget *parent, const eWidget* descr=0, int takefocus=1 )
:eListBoxBase( parent, descr, takefocus, T::getEntryHeight() )
{
@@ -166,8 +166,8 @@ class eListBoxExt: public eListBoxBaseExt
/*emit*/ selchanged((T*)entry);
}
public:
- Signal1<void, T*> selected;
- Signal1<void, T*> selchanged;
+ sigc::signal<void, T*> selected;
+ sigc::signal<void, T*> selchanged;
eListBoxExt(eWidget *parent, const eWidget* descr=0, int takefocus=1 )
:eListBoxBaseExt( parent, descr, takefocus, T::getEntryHeight() )
{
@@ -201,7 +201,7 @@ public:
}
};
-class eListBoxEntry: public Object
+class eListBoxEntry: public sigc::trackable
{
friend class eListBox<eListBoxEntry>;
protected:
@@ -370,19 +370,21 @@ class eListBoxEntryMenu: public eListBoxEntryText
{
friend class eListBox<eListBoxEntryMenu>;
public:
- Signal0<void> selected;
+ sigc::signal<void> selected;
eListBoxEntryMenu(eListBox<eListBoxEntryMenu>* lb, const char* txt, const eString &hlptxt="", int align=0, void *key = NULL, int keytype = value )
:eListBoxEntryText((eListBox<eListBoxEntryText>*)lb, txt, key, align, hlptxt, keytype)
{
- if (listbox)
+ if (listbox) {
CONNECT(listbox->selected, eListBoxEntryMenu::LBSelected);
+ }
}
eListBoxEntryMenu(eListBox<eListBoxEntryMenu>* lb, const eString &txt, const eString &hlptxt="", int align=0, void *key = NULL, int keytype = value )
:eListBoxEntryText((eListBox<eListBoxEntryText>*)lb, txt, key, align, hlptxt, keytype)
{
- if (listbox)
+ if (listbox) {
CONNECT(listbox->selected, eListBoxEntryMenu::LBSelected);
+ }
}
virtual void LBSelected(eListBoxEntry* t)
@@ -419,7 +421,7 @@ class eListBoxEntryCheck: public eListBoxEntryMenu
int checked;
void LBSelected(eListBoxEntry* t);
public:
- Signal1<void,bool> selected;
+ sigc::signal<void,bool> selected;
eListBoxEntryCheck( eListBox<eListBoxEntryMenu> *lb, const char* text, const char* regkey, const eString& hlptxt="" );
const eString& redraw(gPainter *rc, const eRect& rect, gColor coActiveB, gColor coActiveF, gColor coNormalB, gColor coNormalF, int state );
};
diff --git a/tuxbox/enigma/include/lib/gui/slider.h b/tuxbox/enigma/include/lib/gui/slider.h
index 892e09f..3ef3ca7 100644
--- a/tuxbox/enigma/include/lib/gui/slider.h
+++ b/tuxbox/enigma/include/lib/gui/slider.h
@@ -21,7 +21,7 @@ public:
void setIncrement( int i );
void setValue( int i );
int getValue();
- Signal1<void, int> changed;
+ sigc::signal<void, int> changed;
eSlider( eWidget *parent, const eWidget *descr=0, int min=0, int max=99 );
};
diff --git a/tuxbox/enigma/include/lib/gui/statusbar.h b/tuxbox/enigma/include/lib/gui/statusbar.h
index b16f1eb..2b6d754 100644
--- a/tuxbox/enigma/include/lib/gui/statusbar.h
+++ b/tuxbox/enigma/include/lib/gui/statusbar.h
@@ -11,7 +11,7 @@ class eStatusBar : public eLabel
int setProperty(const eString &, const eString &);
void initialize();
- Connection conn;
+ sigc::connection conn;
void init_eStatusBar();
public:
enum
diff --git a/tuxbox/enigma/include/lib/movieplayer/movieplayer.h b/tuxbox/enigma/include/lib/movieplayer/movieplayer.h
index 45e4d8d..d642304 100644
--- a/tuxbox/enigma/include/lib/movieplayer/movieplayer.h
+++ b/tuxbox/enigma/include/lib/movieplayer/movieplayer.h
@@ -38,7 +38,7 @@ struct player_value
short AC3;
};
-class eMoviePlayer: public eMainloop, private eThread, public Object
+class eMoviePlayer: public eMainloop, private eThread, public sigc::trackable
{
struct Message
{
diff --git a/tuxbox/enigma/include/lib/socket/socket.h b/tuxbox/enigma/include/lib/socket/socket.h
index 3fbf811..b35c033 100644
--- a/tuxbox/enigma/include/lib/socket/socket.h
+++ b/tuxbox/enigma/include/lib/socket/socket.h
@@ -15,7 +15,7 @@
#include <libsig_comp.h>
#include <lib/base/buffer.h>
-class eSocket: public Object
+class eSocket: public sigc::trackable
{
private:
int issocket;
@@ -53,12 +53,12 @@ public:
Listening, Connection, Closing };
int state();
- Signal0<void> connectionClosed_;
- Signal0<void> connected_;
- Signal0<void> readyRead_;
- Signal0<void> hangup;
- Signal1<void,int> bytesWritten_;
- Signal1<void,int> error_;
+ sigc::signal<void> connectionClosed_;
+ sigc::signal<void> connected_;
+ sigc::signal<void> readyRead_;
+ sigc::signal<void> hangup;
+ sigc::signal<void,int> bytesWritten_;
+ sigc::signal<void,int> error_;
};
class eUnixDomainSocket: public eSocket
diff --git a/tuxbox/enigma/include/lib/system/file_eraser.h b/tuxbox/enigma/include/lib/system/file_eraser.h
index bf2cefd..12c5443 100644
--- a/tuxbox/enigma/include/lib/system/file_eraser.h
+++ b/tuxbox/enigma/include/lib/system/file_eraser.h
@@ -4,7 +4,7 @@
#include <lib/base/thread.h>
#include <lib/base/message.h>
-class eBackgroundFileEraser: public eMainloop, private eThread, public Object
+class eBackgroundFileEraser: public eMainloop, private eThread, public sigc::trackable
{
struct Message
{
diff --git a/tuxbox/enigma/include/lib/system/httpd.h b/tuxbox/enigma/include/lib/system/httpd.h
index 52b80c8..85700b1 100644
--- a/tuxbox/enigma/include/lib/system/httpd.h
+++ b/tuxbox/enigma/include/lib/system/httpd.h
@@ -87,8 +87,8 @@ private:
void destruct();
void init_eHTTPConnection();
public:
- Signal1<void,int> transferDone;
- Signal1<eHTTPDataSource*,eHTTPConnection*> createDataSource;
+ sigc::signal<void,int> transferDone;
+ sigc::signal<eHTTPDataSource*,eHTTPConnection*> createDataSource;
enum
{
/*
diff --git a/tuxbox/enigma/include/libsig_comp.h b/tuxbox/enigma/include/libsig_comp.h
index 83550ed..decc616 100644
--- a/tuxbox/enigma/include/libsig_comp.h
+++ b/tuxbox/enigma/include/libsig_comp.h
@@ -5,29 +5,29 @@
#include <sigc++/bind.h>
#ifdef SIGC_CXX_NAMESPACES
-using namespace SigC;
+using namespace sigc;
#endif
-#define CONNECT(SENDER, EMPFAENGER) SENDER.connect(slot(*this, &EMPFAENGER))
+#define CONNECT(SENDER, EMPFAENGER) SENDER.connect( mem_fun(*this, &EMPFAENGER))
// use this Makro to connect with a method
// void bla::foo(int x);
// to an
-// Signal<void, int> testSig;
+// sigc::signal<void, int> testSig;
//
// CONNECT(testSig, bla::foo);
-// signal and method (slot) must have the same signature
+// signal and method (slot)(mem_fun) must have the same signature
-#define CONNECT_1_0(SENDER, EMPFAENGER, PARAM) SENDER.connect( bind( slot(*this, &EMPFAENGER) ,PARAM ) )
+#define CONNECT_1_0(SENDER, EMPFAENGER, PARAM) SENDER.connect( bind( mem_fun(*this, &EMPFAENGER) ,PARAM ) )
// use this for connect with a method
// void bla::foo(int);
// to an
-// Signal0<void> testSig;
+// sigc::signal<void> testSig;
// CONNECT_1_0(testSig, bla:foo, 0);
// here the signal has no parameter, but the slot have an int
// the last parameter of the CONNECT_1_0 makro is the value that given to the paramater of the Slot method
-#define CONNECT_2_0(SENDER, EMPFAENGER, PARAM1, PARAM2) SENDER.connect( bind( slot(*this, &EMPFAENGER) ,PARAM1, PARAM2 ) )
+#define CONNECT_2_0(SENDER, EMPFAENGER, PARAM1, PARAM2) SENDER.connect( bind( mem_fun(*this, &EMPFAENGER) ,PARAM1, PARAM2 ) )
-#define CONNECT_2_1(SENDER, EMPFAENGER, PARAM) SENDER.connect( bind( slot(*this, &EMPFAENGER) ,PARAM ) )
+#define CONNECT_2_1(SENDER, EMPFAENGER, PARAM) SENDER.connect( bind( mem_fun(*this, &EMPFAENGER) ,PARAM ) )
#endif // __LIBSIG_COMP_H
diff --git a/tuxbox/enigma/lib/base/eerror.cpp b/tuxbox/enigma/lib/base/eerror.cpp
index 2926bbf..d700173 100644
--- a/tuxbox/enigma/lib/base/eerror.cpp
+++ b/tuxbox/enigma/lib/base/eerror.cpp
@@ -74,7 +74,7 @@ pthread_mutex_t signalLock =
int infatal=0;
-Signal2<void, int, const eString&> logOutput;
+sigc::signal<void, int, const eString&> logOutput;
int logOutputConsole=1;
void eFatal(const char* fmt, ...)
diff --git a/tuxbox/enigma/lib/codecs/codecmp3.cpp b/tuxbox/enigma/lib/codecs/codecmp3.cpp
index 8e0f602..294ac75 100644
--- a/tuxbox/enigma/lib/codecs/codecmp3.cpp
+++ b/tuxbox/enigma/lib/codecs/codecmp3.cpp
@@ -33,7 +33,7 @@ eAudioDecoderMP3::~eAudioDecoderMP3()
mad_stream_finish(&stream);
}
-int eAudioDecoderMP3::decodeMore(int last, int maxsamples, Signal1<void, unsigned int> *)
+int eAudioDecoderMP3::decodeMore(int last, int maxsamples, sigc::signal<void, unsigned int> *)
{
int written = 0;
while (last || (written < maxsamples))
diff --git a/tuxbox/enigma/lib/codecs/codecmpg.cpp b/tuxbox/enigma/lib/codecs/codecmpg.cpp
index dc8f08c..8a5df51 100644
--- a/tuxbox/enigma/lib/codecs/codecmpg.cpp
+++ b/tuxbox/enigma/lib/codecs/codecmpg.cpp
@@ -191,7 +191,7 @@ eDemux::~eDemux()
delete [] sheader;
}
-int eMPEGDemux::decodeMore(int last, int maxsamples, Signal1<void,unsigned int>*newastreamid)
+int eMPEGDemux::decodeMore(int last, int maxsamples, sigc::signal<void,unsigned int>*newastreamid)
{
// eDebug("decodeMore");
int written=0;
@@ -613,7 +613,7 @@ finish:
return written;
}
-int ePVADemux::decodeMore(int last, int maxsamples, Signal1<void,unsigned int>*newastreamid )
+int ePVADemux::decodeMore(int last, int maxsamples, sigc::signal<void,unsigned int>*newastreamid )
{
// eDebug("decodeMore");
int written=0;
diff --git a/tuxbox/enigma/lib/codecs/codecogg.cpp b/tuxbox/enigma/lib/codecs/codecogg.cpp
index 09b93c5..5abc8d6 100644
--- a/tuxbox/enigma/lib/codecs/codecogg.cpp
+++ b/tuxbox/enigma/lib/codecs/codecogg.cpp
@@ -64,7 +64,7 @@ eAudioDecoderOgg::~eAudioDecoderOgg()
ov_clear(&vf);
}
-int eAudioDecoderOgg::decodeMore(int last, int maxsamples, Signal1<void, unsigned int> *)
+int eAudioDecoderOgg::decodeMore(int last, int maxsamples, sigc::signal<void, unsigned int> *)
{
//eDebug ("[OGG]decodeMore:%d,%d,%d",last,maxsamples,input.size());
int written = 0;
diff --git a/tuxbox/enigma/lib/dvb/dvb.cpp b/tuxbox/enigma/lib/dvb/dvb.cpp
index b98998a..885060e 100644
--- a/tuxbox/enigma/lib/dvb/dvb.cpp
+++ b/tuxbox/enigma/lib/dvb/dvb.cpp
@@ -959,7 +959,7 @@ void eTransponderList::leaveTransponder( eTransponder* )
this->callback=0;
}
-void eTransponderList::startHandleSDT(const SDT *sdt, eDVBNamespace dvbnamespace, eOriginalNetworkID onid, eTransportStreamID tsid, Signal0<void> *callback, int startstate )
+void eTransponderList::startHandleSDT(const SDT *sdt, eDVBNamespace dvbnamespace, eOriginalNetworkID onid, eTransportStreamID tsid, sigc::signal<void> *callback, int startstate )
{
sdtscanstate=startstate;
leaveTransponder(0);
@@ -969,7 +969,7 @@ void eTransponderList::startHandleSDT(const SDT *sdt, eDVBNamespace dvbnamespace
handleSDT(sdt, dvbnamespace, onid, tsid, callback );
}
-void eTransponderList::handleSDT(const SDT *sdt, eDVBNamespace dvbnamespace, eOriginalNetworkID onid, eTransportStreamID tsid, Signal0<void> *callback )
+void eTransponderList::handleSDT(const SDT *sdt, eDVBNamespace dvbnamespace, eOriginalNetworkID onid, eTransportStreamID tsid, sigc::signal<void> *callback )
{
if ( sdt )
{
@@ -1101,7 +1101,7 @@ void eTransponderList::handleSDT(const SDT *sdt, eDVBNamespace dvbnamespace, eOr
delete pmt;
pmt=0;
- Signal0<void> &cb = *this->callback;
+ sigc::signal<void> &cb = *this->callback;
this->callback = 0;
/*emit*/ cb();
diff --git a/tuxbox/enigma/lib/dvb/service.cpp b/tuxbox/enigma/lib/dvb/service.cpp
index a56d3ae..1c29f0f 100644
--- a/tuxbox/enigma/lib/dvb/service.cpp
+++ b/tuxbox/enigma/lib/dvb/service.cpp
@@ -88,7 +88,7 @@ void eServiceHandler::setAudioStream( unsigned int )
{
}
-void eServiceHandler::enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback)
+void eServiceHandler::enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback)
{
(void)dir;
(void)callback;
@@ -224,7 +224,7 @@ int eServiceInterface::stop(int workaround)
return res;
}
-void eServiceInterface::enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback)
+void eServiceInterface::enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback)
{
int pLockActive = eConfig::getInstance()->pLockActive();
if ( dir.isLocked() && pLockActive && !checkPin( eConfig::getInstance()->getParentalPin(), _("parental") ) )
diff --git a/tuxbox/enigma/lib/dvb/servicecache.cpp b/tuxbox/enigma/lib/dvb/servicecache.cpp
index 271bf5f..cd3c321 100644
--- a/tuxbox/enigma/lib/dvb/servicecache.cpp
+++ b/tuxbox/enigma/lib/dvb/servicecache.cpp
@@ -1,7 +1,7 @@
#include <lib/dvb/servicecache.h>
#include <lib/system/econfig.h>
-void eServiceCacheBase::enterDirectory(const eServiceReference &parent, Signal1<void, const eServiceReference&> &callback)
+void eServiceCacheBase::enterDirectory(const eServiceReference &parent, sigc::signal<void, const eServiceReference&> &callback)
{
// int pLockActive = eConfig::getInstance()->pLockActive();
std::map<eServiceReference,eNode>::iterator i=cache.find(parent);
diff --git a/tuxbox/enigma/lib/dvb/servicedvb.cpp b/tuxbox/enigma/lib/dvb/servicedvb.cpp
index a4ab1c8..a8a6041 100644
--- a/tuxbox/enigma/lib/dvb/servicedvb.cpp
+++ b/tuxbox/enigma/lib/dvb/servicedvb.cpp
@@ -1395,11 +1395,11 @@ void eServiceHandlerDVB::addFile(void *node, const eString &filename)
struct eServiceHandlerDVB_addService
{
- Signal1<void,const eServiceReference&> &callback;
+ sigc::signal<void,const eServiceReference&> &callback;
int type;
int DVBNamespace;
bool onlyNew;
- eServiceHandlerDVB_addService(Signal1<void,const eServiceReference&> &callback, int type, int DVBNamespace, bool onlyNew=false)
+ eServiceHandlerDVB_addService(sigc::signal<void,const eServiceReference&> &callback, int type, int DVBNamespace, bool onlyNew=false)
: callback(callback), type(type), DVBNamespace(DVBNamespace), onlyNew(onlyNew)
{
}
@@ -1440,7 +1440,7 @@ struct eServiceHandlerDVB_addService
}
};
-void eServiceHandlerDVB::enterDirectory(const eServiceReference &ref, Signal1<void,const eServiceReference&> &callback)
+void eServiceHandlerDVB::enterDirectory(const eServiceReference &ref, sigc::signal<void,const eServiceReference&> &callback)
{
switch (ref.type)
{
diff --git a/tuxbox/enigma/lib/dvb/servicefile.cpp b/tuxbox/enigma/lib/dvb/servicefile.cpp
index 9fdcdd4..a4d1352 100644
--- a/tuxbox/enigma/lib/dvb/servicefile.cpp
+++ b/tuxbox/enigma/lib/dvb/servicefile.cpp
@@ -143,7 +143,7 @@ eService *eServiceFileHandler::createService(const eServiceReference &node)
return handler->createService(node);
}
-void eServiceFileHandler::enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback)
+void eServiceFileHandler::enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback)
{
cache.enterDirectory(dir, callback);
}
diff --git a/tuxbox/enigma/lib/dvb/servicemp3.cpp b/tuxbox/enigma/lib/dvb/servicemp3.cpp
index 837dd4a..5f3f197 100644
--- a/tuxbox/enigma/lib/dvb/servicemp3.cpp
+++ b/tuxbox/enigma/lib/dvb/servicemp3.cpp
@@ -532,7 +532,7 @@ void eMP3Decoder::checkFlow(int last)
int samples=0;
if (last || (i >= audiodecoder->getMinimumFramelength()))
{
- Signal1<void, unsigned int> callback;
+ sigc::signal<void, unsigned int> callback;
CONNECT(callback, eMP3Decoder::newAudioStreamIdFound);
singleLock s(lock); // protect access on all eIOBuffer
samples=audiodecoder->decodeMore(last, 16384, &callback);
diff --git a/tuxbox/enigma/lib/dvb/serviceplaylist.cpp b/tuxbox/enigma/lib/dvb/serviceplaylist.cpp
index 85c8704..091c3b0 100644
--- a/tuxbox/enigma/lib/dvb/serviceplaylist.cpp
+++ b/tuxbox/enigma/lib/dvb/serviceplaylist.cpp
@@ -325,7 +325,7 @@ void eServicePlaylistHandler::removeRef(const eServiceReference &service)
return eServiceFileHandler::getInstance()->removeRef(service);
}
-void eServicePlaylistHandler::enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback)
+void eServicePlaylistHandler::enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback)
{
if (dir.type == id) // for playlists in other playlists..
{
diff --git a/tuxbox/enigma/lib/dvb/servicestructure.cpp b/tuxbox/enigma/lib/dvb/servicestructure.cpp
index 385a60e..61e2bd0 100644
--- a/tuxbox/enigma/lib/dvb/servicestructure.cpp
+++ b/tuxbox/enigma/lib/dvb/servicestructure.cpp
@@ -26,7 +26,7 @@ eServiceStructureHandler::~eServiceStructureHandler()
eServiceInterface::getInstance()->unregisterHandler(id);
}
-void eServiceStructureHandler::enterDirectory(const eServiceReference &dir, Signal1<void,const eServiceReference&> &callback)
+void eServiceStructureHandler::enterDirectory(const eServiceReference &dir, sigc::signal<void,const eServiceReference&> &callback)
{
cache.enterDirectory(dir, callback);
}
diff --git a/tuxbox/enigma/lib/dvb/subtitling.cpp b/tuxbox/enigma/lib/dvb/subtitling.cpp
index 9f00ca6..de7977a 100644
--- a/tuxbox/enigma/lib/dvb/subtitling.cpp
+++ b/tuxbox/enigma/lib/dvb/subtitling.cpp
@@ -596,4 +596,4 @@ void eSubtitleWidget::setForceHide(bool bhide)
forcehide = 0;
show();
}
-}
\ No newline at end of file
+}
diff --git a/tuxbox/enigma/lib/gui/ewidget.cpp b/tuxbox/enigma/lib/gui/ewidget.cpp
index 80e7478..723832d 100644
--- a/tuxbox/enigma/lib/gui/ewidget.cpp
+++ b/tuxbox/enigma/lib/gui/ewidget.cpp
@@ -24,8 +24,8 @@
extern eWidget *currentFocus;
eWidget *eWidget::root;
-Signal2< void, ePtrList<eAction>*, int >eWidget::showHelp;
-Signal1< void, const eWidget*>eWidget::globalFocusChanged;
+sigc::signal< void, ePtrList<eAction>*, int >eWidget::showHelp;
+sigc::signal< void, const eWidget*>eWidget::globalFocusChanged;
eWidget::actionMapList eWidget::globalActions;
eWidget::eWidget(eWidget *_parent, int takefocus)
diff --git a/tuxbox/enigma/src/engrab.h b/tuxbox/enigma/src/engrab.h
index 9c248b7..abb873c 100644
--- a/tuxbox/enigma/src/engrab.h
+++ b/tuxbox/enigma/src/engrab.h
@@ -7,7 +7,7 @@
#include <lib/gui/ewindow.h>
#include <lib/socket/socket.h>
-class ENgrab: public Object
+class ENgrab: public sigc::trackable
{
eString sendStr;
eString startxml( const char * descr=0 );
diff --git a/tuxbox/enigma/src/enigma.h b/tuxbox/enigma/src/enigma.h
index b61fa4e..41e8b3a 100644
--- a/tuxbox/enigma/src/enigma.h
+++ b/tuxbox/enigma/src/enigma.h
@@ -21,7 +21,7 @@ class eHTTPLogResolver;
extern eWidget *currentFocus;
-class eZap: public eApplication, public Object
+class eZap: public eApplication, public sigc::trackable
{
eHotplug hotplug;
static eZap *instance;
diff --git a/tuxbox/enigma/src/enigma_dyn.cpp b/tuxbox/enigma/src/enigma_dyn.cpp
index 24f6f37..879d007 100644
--- a/tuxbox/enigma/src/enigma_dyn.cpp
+++ b/tuxbox/enigma/src/enigma_dyn.cpp
@@ -949,7 +949,7 @@ void genHTMLServicesList(std::list <myService> &myList, eString &serviceRefList,
serviceList = serviceList.left(serviceList.length() - 2);
}
-class eWebNavigatorListDirectory2: public Object
+class eWebNavigatorListDirectory2: public sigc::trackable
{
std::list <myService> &myList;
eString path;
@@ -1067,9 +1067,9 @@ eString getZapContent(eString path, int depth, bool addEPG, bool sortList, bool
// first pass thru is to get all user bouquets
myList.clear();
eWebNavigatorListDirectory2 navlist(myList, path, *iface, addEPG, forceAll, addSatPos);
- Signal1<void, const eServiceReference&> signal;
- signal.connect(slot(navlist, &eWebNavigatorListDirectory2::addEntry));
- iface->enterDirectory(current_service, signal);
+ sigc::signal<void, const eServiceReference&> Signal;
+ Signal.connect(sigc::mem_fun(navlist, &eWebNavigatorListDirectory2::addEntry));
+ iface->enterDirectory(current_service, Signal);
// eDebug("entered");
iface->leaveDirectory(current_service);
// eDebug("exited");
@@ -1095,10 +1095,10 @@ eString getZapContent(eString path, int depth, bool addEPG, bool sortList, bool
myList2.clear();
eWebNavigatorListDirectory2 navlist(myList2, path, *iface, addEPG, forceAll, addSatPos);
- Signal1<void, const eServiceReference&> signal;
- signal.connect(slot(navlist, &eWebNavigatorListDirectory2::addEntry));
+ sigc::signal<void, const eServiceReference&> Signal;
+ Signal.connect(sigc::mem_fun(navlist, &eWebNavigatorListDirectory2::addEntry));
- iface->enterDirectory(current_service, signal);
+ iface->enterDirectory(current_service, Signal);
// eDebug("entered");
iface->leaveDirectory(current_service);
// eDebug("exited");
diff --git a/tuxbox/enigma/src/enigma_dyn_epg.cpp b/tuxbox/enigma/src/enigma_dyn_epg.cpp
index d389678..e3daeb3 100644
--- a/tuxbox/enigma/src/enigma_dyn_epg.cpp
+++ b/tuxbox/enigma/src/enigma_dyn_epg.cpp
@@ -287,7 +287,7 @@ eString getEITC(eString result, eString format)
#define CHANNELWIDTH 200
-class eMEPG: public Object
+class eMEPG: public sigc::trackable
{
int d_min;
eString multiEPG;
@@ -507,7 +507,7 @@ public:
,tableWidth((end - start) / 60 * d_min + channelWidth)
,channelWidth((pdaScreen == 0) ? CHANNELWIDTH : CHANNELWIDTH / 2)
{
- Signal1<void, const eServiceReference&> cbSignal;
+ sigc::signal<void, const eServiceReference&> cbSignal;
CONNECT(cbSignal, eMEPG::getcurepg);
eServiceInterface::getInstance()->enterDirectory(bouquetRef, cbSignal);
eServiceInterface::getInstance()->leaveDirectory(bouquetRef);
diff --git a/tuxbox/enigma/src/enigma_dyn_flash.h b/tuxbox/enigma/src/enigma_dyn_flash.h
index deb27b0..dcb9749 100755
--- a/tuxbox/enigma/src/enigma_dyn_flash.h
+++ b/tuxbox/enigma/src/enigma_dyn_flash.h
@@ -29,7 +29,7 @@ class eHTTPDynPathResolver;
void ezapFlashInitializeDyn(eHTTPDynPathResolver *dyn_resolver, bool lockWeb);
eString getConfigFlashMgr(void);
-class eFlashOperationsHandler: public eMainloop, private eThread, public Object
+class eFlashOperationsHandler: public eMainloop, private eThread, public sigc::trackable
{
eString progressMessage1, progressMessage2;
int progressComplete;
diff --git a/tuxbox/enigma/src/enigma_dyn_misc.cpp b/tuxbox/enigma/src/enigma_dyn_misc.cpp
index 2700487..e172c9e 100644
--- a/tuxbox/enigma/src/enigma_dyn_misc.cpp
+++ b/tuxbox/enigma/src/enigma_dyn_misc.cpp
@@ -638,7 +638,7 @@ static eString getTransponderServices(eString request, eString dirpath, eString
return "E: no DVB service is running.. or this is a playback";
}
-struct listContent: public Object
+struct listContent: public sigc::trackable
{
eString &result;
eServiceInterface *iface;
@@ -647,7 +647,7 @@ struct listContent: public Object
listContent(const eServiceReference &service, eServiceReference &bouquet, eString &result, bool listCont)
:result(result), iface(eServiceInterface::getInstance()), listCont(listCont), bouquet(bouquet)
{
- Signal1<void, const eServiceReference&> cbSignal;
+ sigc::signal<void, const eServiceReference&> cbSignal;
CONNECT(cbSignal, listContent::addToString);
iface->enterDirectory(service, cbSignal);
iface->leaveDirectory(service);
diff --git a/tuxbox/enigma/src/enigma_dyn_pda.cpp b/tuxbox/enigma/src/enigma_dyn_pda.cpp
index 5a0cdfc..07eea55 100644
--- a/tuxbox/enigma/src/enigma_dyn_pda.cpp
+++ b/tuxbox/enigma/src/enigma_dyn_pda.cpp
@@ -146,13 +146,13 @@ static eString getMute()
return result.str();
}
-struct countDVBServices: public Object
+struct countDVBServices: public sigc::trackable
{
int &count;
countDVBServices(const eServiceReference &bouquetRef, int &count)
:count(count)
{
- Signal1<void, const eServiceReference&> cbSignal;
+ sigc::signal<void, const eServiceReference&> cbSignal;
CONNECT(cbSignal, countDVBServices::countFunction);
eServiceInterface::getInstance()->enterDirectory(bouquetRef, cbSignal);
eServiceInterface::getInstance()->leaveDirectory(bouquetRef);
@@ -172,7 +172,7 @@ struct countDVBServices: public Object
}
};
-class eWebNavigatorListDirectory: public Object
+class eWebNavigatorListDirectory: public sigc::trackable
{
eString &result;
eString path;
@@ -256,10 +256,10 @@ eString getPDAZapContent(eString path)
else
{
eWebNavigatorListDirectory navlist(result, path, *iface);
- Signal1<void, const eServiceReference&> signal;
- signal.connect(slot(navlist, &eWebNavigatorListDirectory::addEntry));
+ sigc::signal<void, const eServiceReference&> Signal;
+ Signal.connect(sigc::mem_fun(navlist, &eWebNavigatorListDirectory::addEntry));
result += "<table width=\"100%\" cellspacing=\"2\" cellpadding=\"1\" border=\"0\">\n";
- iface->enterDirectory(current_service, signal);
+ iface->enterDirectory(current_service, Signal);
result += "</table>\n";
// eDebug("entered");
iface->leaveDirectory(current_service);
diff --git a/tuxbox/enigma/src/enigma_dyn_timer.cpp b/tuxbox/enigma/src/enigma_dyn_timer.cpp
index 8aa9470..e998059 100644
--- a/tuxbox/enigma/src/enigma_dyn_timer.cpp
+++ b/tuxbox/enigma/src/enigma_dyn_timer.cpp
@@ -116,7 +116,7 @@ static eString getAfterEvent(int type)
return result;
}
-class eWebNavigatorSearchService: public Object
+class eWebNavigatorSearchService: public sigc::trackable
{
eString &result;
eString searched_service;
@@ -408,9 +408,9 @@ static eString addTVBrowserTimerEvent(eString request, eString dirpath, eString
-2, -1, 0xFFFFFFFF);
eWebNavigatorSearchService navlist(result1, channel, *iface);
- Signal1<void, const eServiceReference&> signal;
- signal.connect(slot(navlist, &eWebNavigatorSearchService::addEntry));
- iface->enterDirectory(all_services, signal);
+ sigc::signal<void, const eServiceReference&> Signal;
+ Signal.connect(sigc::mem_fun(navlist, &eWebNavigatorSearchService::addEntry));
+ iface->enterDirectory(all_services, Signal);
eDebug("entered");
iface->leaveDirectory(all_services);
eDebug("exited");
diff --git a/tuxbox/enigma/src/enigma_dyn_wap.cpp b/tu...
[truncated message content] |
