mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-06 16:15:23 -04:00
Modified the patch from electron.
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat). Recompile needed git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2
parent
7b0a6afa56
commit
92fabf4c56
15 changed files with 222 additions and 237 deletions
|
|
@ -1,241 +0,0 @@
|
|||
#include <QToolButton>
|
||||
#include <QPropertyAnimation>
|
||||
#include <QIcon>
|
||||
#include "AudioPopupChatDialog.h"
|
||||
#include "interface/rsvoip.h"
|
||||
#include "gui/SoundManager.h"
|
||||
#include "util/HandleRichText.h"
|
||||
#include "gui/common/StatusDefs.h"
|
||||
#include <retroshare/rsstatus.h>
|
||||
|
||||
#define CALL_START ":/images/call-start-22.png"
|
||||
#define CALL_STOP ":/images/call-stop-22.png"
|
||||
#define CALL_HOLD ":/images/call-hold-22.png"
|
||||
|
||||
|
||||
AudioPopupChatDialogWidgetsHolder::AudioPopupChatDialogWidgetsHolder()
|
||||
{
|
||||
audioListenToggleButton = new QToolButton ;
|
||||
audioListenToggleButton->setMinimumSize(QSize(28,28)) ;
|
||||
audioListenToggleButton->setMaximumSize(QSize(28,28)) ;
|
||||
audioListenToggleButton->setText(QString()) ;
|
||||
audioListenToggleButton->setToolTip(tr("Mute yourself"));
|
||||
|
||||
std::cerr << "****** VOIPLugin: Creating new AudioPopupChatDialog !!" << std::endl;
|
||||
|
||||
QIcon icon ;
|
||||
icon.addPixmap(QPixmap(":/images/audio-volume-muted-22.png")) ;
|
||||
icon.addPixmap(QPixmap(":/images/audio-volume-medium-22.png"),QIcon::Normal,QIcon::On) ;
|
||||
icon.addPixmap(QPixmap(":/images/audio-volume-medium-22.png"),QIcon::Disabled,QIcon::On) ;
|
||||
icon.addPixmap(QPixmap(":/images/audio-volume-medium-22.png"),QIcon::Active,QIcon::On) ;
|
||||
icon.addPixmap(QPixmap(":/images/audio-volume-medium-22.png"),QIcon::Selected,QIcon::On) ;
|
||||
|
||||
audioListenToggleButton->setIcon(icon) ;
|
||||
audioListenToggleButton->setIconSize(QSize(22,22)) ;
|
||||
audioListenToggleButton->setAutoRaise(true) ;
|
||||
audioListenToggleButton->setCheckable(true);
|
||||
|
||||
audioMuteCaptureToggleButton = new QToolButton ;
|
||||
audioMuteCaptureToggleButton->setMinimumSize(QSize(28,28)) ;
|
||||
audioMuteCaptureToggleButton->setMaximumSize(QSize(28,28)) ;
|
||||
audioMuteCaptureToggleButton->setText(QString()) ;
|
||||
audioMuteCaptureToggleButton->setToolTip(tr("Start Call"));
|
||||
|
||||
QIcon icon2 ;
|
||||
icon2.addPixmap(QPixmap(":/images/call-start-22.png")) ;
|
||||
icon2.addPixmap(QPixmap(":/images/call-hold-22.png"),QIcon::Normal,QIcon::On) ;
|
||||
icon2.addPixmap(QPixmap(":/images/call-hold-22.png"),QIcon::Disabled,QIcon::On) ;
|
||||
icon2.addPixmap(QPixmap(":/images/call-hold-22.png"),QIcon::Active,QIcon::On) ;
|
||||
icon2.addPixmap(QPixmap(":/images/call-hold-22.png"),QIcon::Selected,QIcon::On) ;
|
||||
|
||||
audioMuteCaptureToggleButton->setIcon(icon2) ;
|
||||
audioMuteCaptureToggleButton->setIconSize(QSize(22,22)) ;
|
||||
audioMuteCaptureToggleButton->setAutoRaise(true) ;
|
||||
audioMuteCaptureToggleButton->setCheckable(true) ;
|
||||
|
||||
hangupButton = new QToolButton ;
|
||||
hangupButton->setIcon(QIcon(":/images/call-stop-22.png")) ;
|
||||
hangupButton->setIconSize(QSize(22,22)) ;
|
||||
hangupButton->setMinimumSize(QSize(28,28)) ;
|
||||
hangupButton->setMaximumSize(QSize(28,28)) ;
|
||||
hangupButton->setCheckable(false) ;
|
||||
hangupButton->setAutoRaise(true) ;
|
||||
hangupButton->setText(QString()) ;
|
||||
hangupButton->setToolTip(tr("Hangup Call"));
|
||||
|
||||
connect(audioListenToggleButton, SIGNAL(clicked()), this , SLOT(toggleAudioListen()));
|
||||
connect(audioMuteCaptureToggleButton, SIGNAL(clicked()), this , SLOT(toggleAudioMuteCapture()));
|
||||
connect(hangupButton, SIGNAL(clicked()), this , SLOT(hangupCall()));
|
||||
|
||||
outputProcessor = NULL ;
|
||||
outputDevice = NULL ;
|
||||
inputProcessor = NULL ;
|
||||
inputDevice = NULL ;
|
||||
}
|
||||
|
||||
void AudioPopupChatDialogWidgetsHolder::init(const std::string &peerId, const QString &title, ChatWidget* chatWidget)
|
||||
{
|
||||
this->peerId = peerId;
|
||||
this->chatWidget = chatWidget;
|
||||
}
|
||||
|
||||
std::vector<QWidget*> AudioPopupChatDialogWidgetsHolder::getWidgets()
|
||||
{
|
||||
std::vector<QWidget*> v;
|
||||
v.push_back(audioListenToggleButton);
|
||||
v.push_back(audioMuteCaptureToggleButton);
|
||||
v.push_back(hangupButton);
|
||||
return v;
|
||||
}
|
||||
|
||||
void AudioPopupChatDialogWidgetsHolder::toggleAudioListen()
|
||||
{
|
||||
std::cerr << "******** VOIPLugin: Toggling audio listen!" << std::endl;
|
||||
if (audioListenToggleButton->isChecked()) {
|
||||
audioListenToggleButton->setToolTip(tr("Mute yourself"));
|
||||
} else {
|
||||
audioListenToggleButton->setToolTip(tr("Unmute yourself"));
|
||||
//audioListenToggleButton->setChecked(false);
|
||||
/*if (outputDevice) {
|
||||
outputDevice->stop();
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
void AudioPopupChatDialogWidgetsHolder::hangupCall()
|
||||
{
|
||||
std::cerr << "******** VOIPLugin: Hangup call!" << std::endl;
|
||||
|
||||
disconnect(inputProcessor, SIGNAL(networkPacketReady()), this, SLOT(sendAudioData()));
|
||||
if (inputDevice) {
|
||||
inputDevice->stop();
|
||||
}
|
||||
if (outputDevice) {
|
||||
outputDevice->stop();
|
||||
}
|
||||
audioListenToggleButton->setChecked(false);
|
||||
audioMuteCaptureToggleButton->setChecked(false);
|
||||
}
|
||||
|
||||
void AudioPopupChatDialogWidgetsHolder::toggleAudioMuteCapture()
|
||||
{
|
||||
std::cerr << "******** VOIPLugin: Toggling audio mute capture!" << std::endl;
|
||||
if (audioMuteCaptureToggleButton->isChecked()) {
|
||||
//activate audio output
|
||||
audioListenToggleButton->setChecked(true);
|
||||
audioMuteCaptureToggleButton->setToolTip(tr("Hold Call"));
|
||||
|
||||
//activate audio input
|
||||
if (!inputProcessor) {
|
||||
inputProcessor = new QtSpeex::SpeexInputProcessor();
|
||||
if (outputProcessor) {
|
||||
connect(outputProcessor, SIGNAL(playingFrame(QByteArray*)), inputProcessor, SLOT(addEchoFrame(QByteArray*)));
|
||||
}
|
||||
inputProcessor->open(QIODevice::WriteOnly | QIODevice::Unbuffered);
|
||||
}
|
||||
if (!inputDevice) {
|
||||
inputDevice = AudioDeviceHelper::getPreferedInputDevice();
|
||||
}
|
||||
connect(inputProcessor, SIGNAL(networkPacketReady()), this, SLOT(sendAudioData()));
|
||||
inputDevice->start(inputProcessor);
|
||||
|
||||
if (chatWidget) {
|
||||
chatWidget->addChatMsg(true, tr("VoIP Status"), QDateTime::currentDateTime(), QDateTime::currentDateTime(), tr("Outgoing Call is started..."), ChatWidget::TYPE_SYSTEM);
|
||||
}
|
||||
|
||||
} else {
|
||||
disconnect(inputProcessor, SIGNAL(networkPacketReady()), this, SLOT(sendAudioData()));
|
||||
if (inputDevice) {
|
||||
inputDevice->stop();
|
||||
}
|
||||
audioMuteCaptureToggleButton->setToolTip(tr("Resume Call"));
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void AudioPopupChatDialogWidgetsHolder::addAudioData(const QString name, QByteArray* array)
|
||||
{
|
||||
if (!audioMuteCaptureToggleButton->isChecked()) {
|
||||
//launch an animation. Don't launch it if already animating
|
||||
if (!audioMuteCaptureToggleButton->graphicsEffect() ||
|
||||
(audioMuteCaptureToggleButton->graphicsEffect()->inherits("QGraphicsOpacityEffect") &&
|
||||
((QGraphicsOpacityEffect*)audioMuteCaptureToggleButton->graphicsEffect())->opacity() == 1)
|
||||
) {
|
||||
QGraphicsOpacityEffect *effect = new QGraphicsOpacityEffect(audioListenToggleButton);
|
||||
audioMuteCaptureToggleButton->setGraphicsEffect(effect);
|
||||
QPropertyAnimation *anim = new QPropertyAnimation(effect, "opacity");
|
||||
anim->setStartValue(1);
|
||||
anim->setKeyValueAt(0.5,0);
|
||||
anim->setEndValue(1);
|
||||
anim->setDuration(400);
|
||||
anim->start();
|
||||
}
|
||||
|
||||
// soundManager->play(VOIP_SOUND_INCOMING_CALL);
|
||||
|
||||
audioMuteCaptureToggleButton->setToolTip(tr("Answer"));
|
||||
|
||||
//TODO make a toaster and a sound for the incoming call
|
||||
return;
|
||||
}
|
||||
|
||||
if (!outputDevice) {
|
||||
outputDevice = AudioDeviceHelper::getDefaultOutputDevice();
|
||||
}
|
||||
|
||||
if (!outputProcessor) {
|
||||
//start output audio device
|
||||
outputProcessor = new QtSpeex::SpeexOutputProcessor();
|
||||
if (inputProcessor) {
|
||||
connect(outputProcessor, SIGNAL(playingFrame(QByteArray*)), inputProcessor, SLOT(addEchoFrame(QByteArray*)));
|
||||
}
|
||||
outputProcessor->open(QIODevice::ReadOnly | QIODevice::Unbuffered);
|
||||
outputDevice->start(outputProcessor);
|
||||
}
|
||||
|
||||
if (outputDevice && outputDevice->error() != QAudio::NoError) {
|
||||
std::cerr << "Restarting output device. Error before reset " << outputDevice->error() << " buffer size : " << outputDevice->bufferSize() << std::endl;
|
||||
outputDevice->stop();
|
||||
outputDevice->reset();
|
||||
if (outputDevice->error() == QAudio::UnderrunError)
|
||||
outputDevice->setBufferSize(20);
|
||||
outputDevice->start(outputProcessor);
|
||||
}
|
||||
outputProcessor->putNetworkPacket(name, *array);
|
||||
|
||||
//check the input device for errors
|
||||
if (inputDevice && inputDevice->error() != QAudio::NoError) {
|
||||
std::cerr << "Restarting input device. Error before reset " << inputDevice->error() << std::endl;
|
||||
inputDevice->stop();
|
||||
inputDevice->reset();
|
||||
inputDevice->start(inputProcessor);
|
||||
}
|
||||
}
|
||||
|
||||
void AudioPopupChatDialogWidgetsHolder::sendAudioData() {
|
||||
while(inputProcessor && inputProcessor->hasPendingPackets()) {
|
||||
QByteArray qbarray = inputProcessor->getNetworkPacket();
|
||||
RsVoipDataChunk chunk;
|
||||
chunk.size = qbarray.size();
|
||||
chunk.data = (void*)qbarray.constData();
|
||||
rsVoip->sendVoipData(peerId,chunk);
|
||||
}
|
||||
}
|
||||
|
||||
void AudioPopupChatDialogWidgetsHolder::updateStatus(int status)
|
||||
{
|
||||
audioListenToggleButton->setEnabled(true);
|
||||
audioMuteCaptureToggleButton->setEnabled(true);
|
||||
hangupButton->setEnabled(true);
|
||||
|
||||
switch (status) {
|
||||
case RS_STATUS_OFFLINE:
|
||||
audioListenToggleButton->setEnabled(false);
|
||||
audioMuteCaptureToggleButton->setEnabled(false);
|
||||
hangupButton->setEnabled(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue