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

patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-01-01 22:25:49 +00:00
parent 0e134d0a92
commit 7b0a6afa56
9 changed files with 122 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,18 +33,31 @@ void PluginGUIHandler::ReceivedVoipData(const QString& peer_id)
return ;
}
ChatDialog *di = ChatDialog::getExistingChat(peer_id.toStdString()) ;
ChatDialog *cd = ChatDialog::getExistingChat(peer_id.toStdString()) ;
AudioPopupChatDialog *adi = dynamic_cast<AudioPopupChatDialog*>(di) ;
PopupChatDialog *pcd = dynamic_cast<PopupChatDialog*>(cd);
if(adi != NULL)
for(unsigned int i=0;i<chunks.size();++i)
{
QByteArray qb(reinterpret_cast<const char *>(chunks[i].data),chunks[i].size) ;
adi->addAudioData(peer_id,&qb) ;
free(chunks[i].data) ;
}
else
std::cerr << "Error: received audio data for a chat dialog that does not stand Audio (Peer id = " << peer_id.toStdString() << "!" << std::endl;
if(pcd != NULL)
{
std::vector<PopupChatDialog_WidgetsHolder*> whs = pcd->getWidgets();
for(unsigned int whIndex=0; whIndex<whs.size(); whIndex++)
{
AudioPopupChatDialogWidgetsHolder* apcdwh;
if((apcdwh = dynamic_cast<AudioPopupChatDialogWidgetsHolder*>(whs[whIndex])))
{
for(unsigned int chunkIndex=0; chunkIndex<chunks.size(); chunkIndex++){
QByteArray qb(reinterpret_cast<const char *>(chunks[chunkIndex].data),chunks[chunkIndex].size);
apcdwh->addAudioData(peer_id,&qb);
}
}
}
}
else
{
std::cerr << "Error: received audio data for a chat dialog that does not stand Audio (Peer id = " << peer_id.toStdString() << "!" << std::endl;
}
for(unsigned int chunkIndex=0; chunkIndex<chunks.size(); chunkIndex++){
free(chunks[chunkIndex].data);
}
}