diff --git a/plugins/VOIP/VOIPPlugin.h b/plugins/VOIP/VOIPPlugin.h index f399f05b5..c09292f81 100644 --- a/plugins/VOIP/VOIPPlugin.h +++ b/plugins/VOIP/VOIPPlugin.h @@ -1,23 +1,23 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/VOIPPlugin.h * + * * + * Copyright 2015 by retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once /*VOIP*/ diff --git a/plugins/VOIP/interface/rsVOIP.h b/plugins/VOIP/interface/rsVOIP.h index 8b7fd3d7b..f5a159893 100644 --- a/plugins/VOIP/interface/rsVOIP.h +++ b/plugins/VOIP/interface/rsVOIP.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/interface/rsVOIP.h * + * * + * Copyright 2015 by retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ // interface class for p3VOIP service // diff --git a/plugins/VOIP/p3Voip.h b/plugins/VOIP/p3Voip.h deleted file mode 100644 index ff532ec3e..000000000 --- a/plugins/VOIP/p3Voip.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Services for RetroShare. - * - * Copyright 2011-2012 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -#pragma once - -#include -#include -#include - -#include "serialiser/rsmsgitems.h" -#include "services/p3service.h" -#include "retroshare/rsmsgs.h" -#include "plugins/rspqiservice.h" -#include "rsvoip.h" - -//!The basic VOIP service. - -class p3VoipService: public RsPQIService, public RsVoipServiceInterface -{ - public: - p3VoipService(RsPluginHandler *handler) - : RsPQIService(RS_SERVICE_TYPE_VOIP_PLUGIN,CONFIG_TYPE_VOIP_PLUGIN,0,handler) - {} - - /***** overloaded from p3Service *****/ - /*! - * This retrieves all chat msg items and also (important!) - * processes chat-status items that are in service item queue. chat msg item requests are also processed and not returned - * (important! also) notifications sent to notify base on receipt avatar, immediate status and custom status - * : notifyCustomState, notifyChatStatus, notifyPeerHasNewAvatar - * @see NotifyBase - */ - virtual int tick() { return 0 ;} -// virtual int status(); - - // /*************** pqiMonitor callback ***********************/ - // virtual void statusChange(const std::list &plist); - - /*! - * public chat sent to all peers - */ - int sendVoipData(const void *data,uint32_t size) { return 0 ;} - - // config values - - virtual int getVoipATransmit() const { return _atransmit ; } - virtual void setVoipATransmit(int) ; - virtual int getVoipVoiceHold() const { return _voice_hold ; } - virtual void setVoipVoiceHold(int) ; - virtual int getVoipfVADmin() const { return _vadmin ; } - virtual void setVoipfVADmin(int) ; - virtual int getVoipfVADmax() const { return _vadmax ; } - virtual void setVoipfVADmax(int) ; - virtual int getVoipiNoiseSuppress() const { return _noise_suppress ; } - virtual void setVoipiNoiseSuppress(int) ; - virtual int getVoipiMinLoudness() const { return _min_loudness ; } - virtual void setVoipiMinLoudness(int) ; - virtual bool getVoipEchoCancel() const { return _echo_cancel ; } - virtual void setVoipEchoCancel(bool) ; - - protected: - /************* from p3Config *******************/ - virtual RsSerialiser *setupSerialiser() ; - - /*! - * chat msg items and custom status are saved - */ - virtual bool saveList(bool& cleanup, std::list&) ; - virtual bool loadList(std::list& load) ; - - private: - //RsMutex mChatMtx; - - void receiveVoipQueue() {} - - int _atransmit ; - int _voice_hold ; - int _vadmin ; - int _vadmax ; - int _min_loudness ; - int _noise_suppress ; - bool _echo_cancel ; -}; -