Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-21 12:54:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed VOIP compilation (patch from electron)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-12-30 14:26:04 +00:00
parent 530fcab61d
commit 326d91d4c7
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/VOIP/gui/PluginGUIHandler.cpp
View file

@ -33,7 +33,7 @@ void PluginGUIHandler::ReceivedVoipData(const QString& qpeer_id)
return ; return ;
} }
ChatDialog *di = ChatDialog::getExistingChat(peer_id) ; ChatDialog *di = ChatDialog::getExistingChat(ChatId(peer_id)) ;
if (di) { if (di) {
ChatWidget *cw = di->getChatWidget(); ChatWidget *cw = di->getChatWidget();
if (cw) { if (cw) {
@ -74,7 +74,7 @@ void PluginGUIHandler::ReceivedVoipBandwidthInfo(const QString& qpeer_id,int byt
{ {
RsPeerId peer_id(qpeer_id.toStdString()) ; RsPeerId peer_id(qpeer_id.toStdString()) ;
ChatDialog *di = ChatDialog::getExistingChat(peer_id) ; ChatDialog *di = ChatDialog::getExistingChat(ChatId(peer_id)) ;
std::cerr << "PluginGUIHandler::received bw info for peer " << qpeer_id.toStdString() << ": " << bytes_per_sec << " Bps" << std::endl; std::cerr << "PluginGUIHandler::received bw info for peer " << qpeer_id.toStdString() << ": " << bytes_per_sec << " Bps" << std::endl;
if(!di) if(!di)

4
plugins/VOIP/gui/VOIPChatWidgetHolder.cpp
View file

@ -304,7 +304,7 @@ void VOIPChatWidgetHolder::sendVideoData()
RsVoipDataChunk chunk ; RsVoipDataChunk chunk ;
while(inputVideoDevice && inputVideoDevice->getNextEncodedPacket(chunk)) while(inputVideoDevice && inputVideoDevice->getNextEncodedPacket(chunk))
rsVoip->sendVoipData(mChatWidget->getPeerId(),chunk) ; rsVoip->sendVoipData(mChatWidget->getChatId().toPeerId(),chunk) ;
} }
void VOIPChatWidgetHolder::sendAudioData() void VOIPChatWidgetHolder::sendAudioData()
@ -315,7 +315,7 @@ void VOIPChatWidgetHolder::sendAudioData()
chunk.size = qbarray.size(); chunk.size = qbarray.size();
chunk.data = (void*)qbarray.constData(); chunk.data = (void*)qbarray.constData();
chunk.type = RsVoipDataChunk::RS_VOIP_DATA_TYPE_AUDIO ; chunk.type = RsVoipDataChunk::RS_VOIP_DATA_TYPE_AUDIO ;
rsVoip->sendVoipData(mChatWidget->getPeerId(),chunk); rsVoip->sendVoipData(mChatWidget->getChatId().toPeerId(),chunk);
} }
} }

4
plugins/plugins.pro
View file

@ -1,5 +1,5 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS += \ SUBDIRS += \
#VOIP \ VOIP \
#FeedReader FeedReader

5
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -306,6 +306,11 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
processSettings(true); processSettings(true);
} }
ChatId ChatWidget::getChatId()
{
return chatId;
}
ChatWidget::ChatType ChatWidget::chatType() ChatWidget::ChatType ChatWidget::chatType()
{ {
// transformation from ChatId::Type to ChatWidget::ChatType // transformation from ChatId::Type to ChatWidget::ChatType

1
retroshare-gui/src/gui/chat/ChatWidget.h
View file

@ -72,6 +72,7 @@ public:
~ChatWidget(); ~ChatWidget();
void init(const ChatId &chat_id, const QString &title); void init(const ChatId &chat_id, const QString &title);
ChatId getChatId();
ChatType chatType(); ChatType chatType();
bool hasNewMessages() { return newMessages; } bool hasNewMessages() { return newMessages; }