From fbce07eab07f243983ab309727f01c0409e48c50 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 18 Feb 2012 16:15:37 +0000 Subject: [PATCH] saved current work on VOIP plugin. Not working yet. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4959 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/VOIP/VOIPPlugin.cpp | 2 +- plugins/VOIP/p3Voip.h | 6 ++++-- plugins/VOIP/rsvoip.h | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/VOIP/VOIPPlugin.cpp b/plugins/VOIP/VOIPPlugin.cpp index 161607602..489f23f44 100644 --- a/plugins/VOIP/VOIPPlugin.cpp +++ b/plugins/VOIP/VOIPPlugin.cpp @@ -47,7 +47,7 @@ RsPQIService *VOIPPlugin::rs_pqi_service() const { if(mVoip == NULL) { - mVoip = new p3VoipService(/*mPlugInHandler*/) ; // , 3600 * 24 * 30 * 6); // 6 Months + mVoip = new p3VoipService(mPlugInHandler) ; // , 3600 * 24 * 30 * 6); // 6 Months rsVoip = mVoip ; } diff --git a/plugins/VOIP/p3Voip.h b/plugins/VOIP/p3Voip.h index cf27aa04a..2907cec2b 100644 --- a/plugins/VOIP/p3Voip.h +++ b/plugins/VOIP/p3Voip.h @@ -39,7 +39,9 @@ class p3VoipService: public RsPQIService, public RsVoip { public: - p3VoipService() : RsPQIService(RS_SERVICE_TYPE_VOIP) {} + p3VoipService(RsPluginHandler *handler) + : RsPQIService(RS_SERVICE_TYPE_VOIP,CONFIG_TYPE_VOIP,0,handler) + {} /***** overloaded from p3Service *****/ /*! @@ -49,7 +51,7 @@ class p3VoipService: public RsPQIService, public RsVoip * : notifyCustomState, notifyChatStatus, notifyPeerHasNewAvatar * @see NotifyBase */ - virtual void tick(); + virtual int tick(); virtual int status(); // /*************** pqiMonitor callback ***********************/ diff --git a/plugins/VOIP/rsvoip.h b/plugins/VOIP/rsvoip.h index 1f75584ff..eb337108c 100644 --- a/plugins/VOIP/rsvoip.h +++ b/plugins/VOIP/rsvoip.h @@ -8,6 +8,9 @@ class RsVoip ; extern RsVoip *rsVoip; +static const uint32_t CONFIG_TYPE_VOIP = 0xe001 ; +//static const uint32_t RS_SERVICE_TYPE_VOIP = 0xe001 ; + class RsVoip { public: