merged existing p3VoRS service with VOIP plugin

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-02-19 15:07:47 +00:00
parent 08d57e1681
commit 2f38506763
14 changed files with 730 additions and 102 deletions

View file

@ -1,8 +1,7 @@
#pragma once
#include <retroshare/rsplugin.h>
#include <gui/mainpage.h>
#include "p3Voip.h"
#include "services/p3vors.h"
class VOIPPlugin: public RsPlugin
{
@ -26,7 +25,7 @@ class VOIPPlugin: public RsPlugin
virtual void setInterfaces(RsPlugInInterfaces& interfaces);
private:
mutable p3VoipService *mVoip ;
mutable p3VoRS *mVoip ;
mutable RsPluginHandler *mPlugInHandler;
mutable RsPeers* mPeers;
mutable ConfigPage *config_page ;