Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed debug msgs and compilation warnings. Added missing include

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-08-30 16:14:55 +00:00
parent 5d4901c3c5
commit afca515165
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/VOIP/VOIP.pro
View File

@ -13,7 +13,7 @@ lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) | win32 {
QT += multimedia QT += multimedia
} }
INCLUDEPATH += ../../retroshare-gui/src/temp/ui INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
#################################### Windows ##################################### #################################### Windows #####################################

4
plugins/VOIP/gui/SpeexProcessor.h
View File

@ -61,7 +61,7 @@ namespace QtSpeex {
void networkPacketReady(); void networkPacketReady();
protected: protected:
virtual qint64 readData(char *data, qint64 maxSize) {return false;} //not used for input processor virtual qint64 readData(char * /*data*/, qint64 /*maxSize*/) {return false;} //not used for input processor
virtual qint64 writeData(const char *data, qint64 maxSize); virtual qint64 writeData(const char *data, qint64 maxSize);
virtual bool isSequential() const; virtual bool isSequential() const;
@ -97,7 +97,7 @@ namespace QtSpeex {
protected: protected:
virtual qint64 readData(char *data, qint64 maxSize); virtual qint64 readData(char *data, qint64 maxSize);
virtual qint64 writeData(const char *data, qint64 maxSize) {return 0;} //not used for output processor virtual qint64 writeData(const char * /*data*/, qint64 /*maxSize*/) {return 0;} //not used for output processor
virtual bool isSequential() const; virtual bool isSequential() const;
signals: signals:

24
plugins/VOIP/services/p3vors.cc
View File

@ -166,7 +166,9 @@ p3VoRS::p3VoRS(RsPluginHandler *handler,PluginNotifier *notifier)
int p3VoRS::tick() int p3VoRS::tick()
{ {
#ifdef DEBUG_VORS
std::cerr << "ticking p3VoRS" << std::endl; std::cerr << "ticking p3VoRS" << std::endl;
#endif
processIncoming(); processIncoming();
sendPackets(); sendPackets();
@ -236,7 +238,9 @@ int p3VoRS::sendVoipRinging(const std::string& peer_id)
int p3VoRS::sendVoipData(const std::string& peer_id,const RsVoipDataChunk& chunk) int p3VoRS::sendVoipData(const std::string& peer_id,const RsVoipDataChunk& chunk)
{ {
#ifdef DEBUG_VORS
std::cerr << "Sending " << chunk.size << " bytes of voip data." << std::endl; std::cerr << "Sending " << chunk.size << " bytes of voip data." << std::endl;
#endif
RsVoipDataItem *item = new RsVoipDataItem ; RsVoipDataItem *item = new RsVoipDataItem ;
@ -314,19 +318,27 @@ void p3VoRS::handleProtocol(RsVoipProtocolItem *item)
switch(item->protocol) switch(item->protocol)
{ {
case RsVoipProtocolItem::VoipProtocol_Ring: std::cerr << "p3VoRS::handleProtocol(): Received protocol ring item." << std::endl; case RsVoipProtocolItem::VoipProtocol_Ring: mNotify->notifyReceivedVoipInvite(item->PeerId());
mNotify->notifyReceivedVoipInvite(item->PeerId()); #ifdef DEBUG_VORS
std::cerr << "p3VoRS::handleProtocol(): Received protocol ring item." << std::endl;
#endif
break ; break ;
case RsVoipProtocolItem::VoipProtocol_Ackn: std::cerr << "p3VoRS::handleProtocol(): Received protocol accept call" << std::endl; case RsVoipProtocolItem::VoipProtocol_Ackn: mNotify->notifyReceivedVoipAccept(item->PeerId());
mNotify->notifyReceivedVoipAccept(item->PeerId()); #ifdef DEBUG_VORS
std::cerr << "p3VoRS::handleProtocol(): Received protocol accept call" << std::endl;
#endif
break ; break ;
case RsVoipProtocolItem::VoipProtocol_Close: std::cerr << "p3VoRS::handleProtocol(): Received protocol Close call." << std::endl; case RsVoipProtocolItem::VoipProtocol_Close: mNotify->notifyReceivedVoipHangUp(item->PeerId());
mNotify->notifyReceivedVoipHangUp(item->PeerId()); #ifdef DEBUG_VORS
std::cerr << "p3VoRS::handleProtocol(): Received protocol Close call." << std::endl;
#endif
break ; break ;
default: default:
#ifdef DEBUG_VORS
std::cerr << "p3VoRS::handleProtocol(): Received protocol item # " << item->protocol << ": not handled yet ! Sorry" << std::endl; std::cerr << "p3VoRS::handleProtocol(): Received protocol item # " << item->protocol << ": not handled yet ! Sorry" << std::endl;
#endif
break ; break ;
} }