Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 22:25:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged existing p3VoRS service with VOIP plugin

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
plugins/VOIP/VOIPPlugin.cpp
View file

@ -3,7 +3,8 @@
#include <QApplication>
#include "VOIPPlugin.h"
#include "AudioInputConfig.h"
#include "interface/rsvoip.h"
#include "gui/AudioInputConfig.h"
static void *inited = new VOIPPlugin() ;
@ -38,18 +39,15 @@ void VOIPPlugin::setInterfaces(RsPlugInInterfaces &interfaces)
ConfigPage *VOIPPlugin::qt_config_page() const
{
if(config_page == NULL)
config_page = new AudioInputConfig() ;
return config_page ;
return new AudioInputConfig() ;
}
RsPQIService *VOIPPlugin::rs_pqi_service() const
{
if(mVoip == NULL)
{
mVoip = new p3VoipService(mPlugInHandler) ; // , 3600 * 24 * 30 * 6); // 6 Months
rsVoipSI = mVoip ;
mVoip = new p3VoRS(mPlugInHandler) ; // , 3600 * 24 * 30 * 6); // 6 Months
rsVoip = mVoip ;
}
return mVoip ;