Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

patch 1d83f7b from joss to VOIP plugin

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-02-26 20:31:16 +00:00
parent 1ee48b68a6
commit e9b53f0a12
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/VOIP/gui/AudioPopupChatDialog.cpp
View File

@ -18,8 +18,7 @@ AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Normal,QIcon::On) ; icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Normal,QIcon::On) ;
icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Disabled,QIcon::On) ; icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Disabled,QIcon::On) ;
icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Active,QIcon::On) ; icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Active,QIcon::On) ;
icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Selected,QIcon::On) ; icon.addPixmap(QPixmap(":/images/self_undeafened.svg"),QIcon::Selected,QIcon::On) ;
//icon.addPixmap(QPixmap(":/images/deafened_self.svg")) ;
audioListenToggleButton->setIcon(icon) ; audioListenToggleButton->setIcon(icon) ;
audioListenToggleButton->setIconSize(QSize(22,22)) ; audioListenToggleButton->setIconSize(QSize(22,22)) ;
@ -36,8 +35,7 @@ AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Normal,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Normal,QIcon::On) ;
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Disabled,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Disabled,QIcon::On) ;
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Active,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Active,QIcon::On) ;
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Selected,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Selected,QIcon::On) ;
//icon2.addPixmap(QPixmap(":/images/muted_self.svg")) ;
audioMuteCaptureToggleButton->setIcon(icon2) ; audioMuteCaptureToggleButton->setIcon(icon2) ;
audioMuteCaptureToggleButton->setIconSize(QSize(22,22)) ; audioMuteCaptureToggleButton->setIconSize(QSize(22,22)) ;
@ -159,8 +157,7 @@ void AudioPopupChatDialog::sendAudioData() {
QByteArray qbarray = inputProcessor->getNetworkPacket(); QByteArray qbarray = inputProcessor->getNetworkPacket();
RsVoipDataChunk chunk; RsVoipDataChunk chunk;
chunk.size = qbarray.size(); chunk.size = qbarray.size();
chunk.data = malloc(qbarray.size()); chunk.data = (void*)qbarray.constData();
memcpy(chunk.data,qbarray.constData(),qbarray.size()) ;
rsVoip->sendVoipData(peerId,chunk); rsVoip->sendVoipData(peerId,chunk);
} }
} }

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

@ -8,7 +8,7 @@
void PluginGUIHandler::ReceivedInvitation(const QString& peer_id) void PluginGUIHandler::ReceivedInvitation(const QString& peer_id)
{ {
std::cerr << "****** Plugin GUI handler: received data!" << std::endl; std::cerr << "****** Plugin GUI handler: received Invitation!" << std::endl;
} }
void PluginGUIHandler::ReceivedVoipHangUp(const QString& peer_id) void PluginGUIHandler::ReceivedVoipHangUp(const QString& peer_id)
@ -23,7 +23,7 @@ void PluginGUIHandler::ReceivedVoipAccept(const QString& peer_id)
void PluginGUIHandler::ReceivedVoipData(const QString& peer_id) void PluginGUIHandler::ReceivedVoipData(const QString& peer_id)
{ {
std::cerr << "****** Plugin GUI handler: received invitation!" << std::endl; std::cerr << "****** Plugin GUI handler: received VoipData!" << std::endl;
std::vector<RsVoipDataChunk> chunks ; std::vector<RsVoipDataChunk> chunks ;