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

Merging branches/v0.6-initdev into trunk.

Browse source 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-02-01 14:16:15 +00:00
commit c0738eec7f
407 changed files with 23716 additions and 50779 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/VOIP/gui/SpeexProcessor.h
View file

@ -22,7 +22,7 @@
#define SAMPLING_RATE 16000 //must be the same as the speex setted mode (speex_wb_mode)
#define FRAME_SIZE 320 //must be the same as the speex setted mode (speex_wb_mode)
#define ECHOTAILSIZE 25
#define ECHOTAILSIZE 10
class SpeexBits;

60
plugins/VOIP/services/p3vors.cc
View file

@ -167,7 +167,7 @@ int p3VoRS::tick()
std::cerr << "ticking p3VoRS" << std::endl;
#endif
processIncoming();
//processIncoming();
sendPackets();
return 0;
@ -392,44 +392,46 @@ bool p3VoRS::getIncomingData(const std::string& peer_id,std::vector<RsVoipDataCh
return true ;
}
int p3VoRS::processIncoming()
bool p3VoRS::recvItem(RsItem *item)
{
/* for each packet - pass to specific handler */
RsItem *item = NULL;
while(NULL != (item = recvItem()))
/* pass to specific handler */
bool keep = false ;
switch(item->PacketSubType())
{
bool keep = false ;
case RS_PKT_SUBTYPE_VOIP_PING:
handlePing(dynamic_cast<RsVoipPingItem*>(item));
break;
switch(item->PacketSubType())
{
case RS_PKT_SUBTYPE_VOIP_PING: handlePing(dynamic_cast<RsVoipPingItem*>(item));
break;
case RS_PKT_SUBTYPE_VOIP_PONG:
handlePong(dynamic_cast<RsVoipPongItem*>(item));
break;
case RS_PKT_SUBTYPE_VOIP_PONG: handlePong(dynamic_cast<RsVoipPongItem*>(item));
break;
case RS_PKT_SUBTYPE_VOIP_PROTOCOL:
handleProtocol(dynamic_cast<RsVoipProtocolItem*>(item)) ;
break ;
case RS_PKT_SUBTYPE_VOIP_PROTOCOL: handleProtocol(dynamic_cast<RsVoipProtocolItem*>(item)) ;
break ;
case RS_PKT_SUBTYPE_VOIP_DATA: handleData(dynamic_cast<RsVoipDataItem*>(item));
keep = true ;
break;
case RS_PKT_SUBTYPE_VOIP_DATA:
handleData(dynamic_cast<RsVoipDataItem*>(item));
keep = true ;
break;
#if 0
/* THESE ARE ALL FUTURISTIC DATA TYPES */
case RS_BANDWIDTH_PING_ITEM: handleBandwidthPing(item);
break;
case RS_BANDWIDTH_PING_ITEM:
handleBandwidthPing(item);
break;
case RS_BANDWIDTH_PONG_ITEM: handleBandwidthPong(item);
break;
case RS_BANDWIDTH_PONG_ITEM:
handleBandwidthPong(item);
break;
#endif
default:
break;
}
/* clean up */
if(!keep)
delete item;
default:
break;
}
/* clean up */
if(!keep)
delete item;
return true ;
}

3
plugins/VOIP/services/p3vors.h
View file

@ -99,6 +99,7 @@ class p3VoRS: public RsPQIService, public RsVoip
*/
virtual int tick();
virtual int status();
virtual bool recvItem(RsItem *item);
/*************** pqiMonitor callback ***********************/
//virtual void statusChange(const std::list<pqipeer> &plist);
@ -130,7 +131,7 @@ class p3VoRS: public RsPQIService, public RsVoip
private:
int sendPackets();
void sendPingMeasurements();
int processIncoming();
//int processIncoming();
int handlePing(RsVoipPingItem *item);
int handlePong(RsVoipPongItem *item);