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

Changed SoundManger to allow the plugins to play sounds.

Browse source 
Added example to VOIP (commented out).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-10-21 21:38:55 +00:00
parent 56635e4ce4
commit 232af8e71e
11 changed files with 109 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/VOIP/VOIPPlugin.cpp
View file

@ -14,6 +14,7 @@
#include "gui/AudioPopupChatDialog.h"
#include "gui/PluginGUIHandler.h"
#include "gui/PluginNotifier.h"
#include "gui/SoundManager.h"
#define IMAGE_VOIP ":/images/talking_on.svg"
@ -175,4 +176,7 @@ QTranslator* VOIPPlugin::qt_translator(QApplication */*app*/, const QString& lan
return NULL;
}
void VOIPPlugin::qt_sound_events(SoundEvents &/*events*/) const
{
// events.addEvent(QApplication::translate("VOIP", "VOIP"), QApplication::translate("VOIP", "Incoming call"), VOIP_SOUND_INCOMING_CALL);
}

1
plugins/VOIP/VOIPPlugin.h
View file

@ -22,6 +22,7 @@ class VOIPPlugin: public RsPlugin
virtual QIcon *qt_icon() const;
virtual QTranslator *qt_translator(QApplication *app, const QString& languageCode, const QString& externalDir) const;
virtual void qt_sound_events(SoundEvents &events) const;
virtual void getPluginVersion(int& major,int& minor,int& svn_rev) const ;
virtual void setPlugInHandler(RsPluginHandler *pgHandler);

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

@ -3,6 +3,7 @@
#include <QIcon>
#include "AudioPopupChatDialog.h"
#include "interface/rsvoip.h"
#include "gui/SoundManager.h"
AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
: PopupChatDialog(parent)
@ -10,7 +11,7 @@ AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
audioListenToggleButton = new QPushButton ;
audioListenToggleButton->setMinimumSize(QSize(28,28)) ;
audioListenToggleButton->setMaximumSize(QSize(28,28)) ;
audioListenToggleButton->setText(QString()) ;
audioListenToggleButton->setText(QString()) ;
audioListenToggleButton->setToolTip(tr("Mute yourself"));
std::cerr << "****** VOIPLugin: Creating new AudioPopupChatDialog !!" << std::endl;
@ -30,7 +31,7 @@ AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
audioMuteCaptureToggleButton = new QPushButton ;
audioMuteCaptureToggleButton->setMinimumSize(QSize(28,28)) ;
audioMuteCaptureToggleButton->setMaximumSize(QSize(28,28)) ;
audioMuteCaptureToggleButton->setText(QString()) ;
audioMuteCaptureToggleButton->setText(QString()) ;
audioMuteCaptureToggleButton->setToolTip(tr("Deafen yourself"));
QIcon icon2 ;
@ -62,7 +63,7 @@ AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
void AudioPopupChatDialog::toggleAudioListen()
{
std::cerr << "******** VOIPLugin: Toggling audio listen!" << std::endl;
if (audioListenToggleButton->isChecked()) {
if (audioListenToggleButton->isChecked()) {
} else {
//audioListenToggleButton->setChecked(false);
/*if (outputDevice) {
@ -118,6 +119,8 @@ void AudioPopupChatDialog::addAudioData(const QString name, QByteArray* array)
anim->start();
}
// soundManager->play(VOIP_SOUND_INCOMING_CALL);
//TODO make a toaster and a sound for the incoming call
return;
}

2
plugins/VOIP/gui/AudioPopupChatDialog.h
View file

@ -6,6 +6,8 @@
class QPushButton;
#define VOIP_SOUND_INCOMING_CALL "VOIP_incoming_call"
class AudioPopupChatDialog: public PopupChatDialog
{
Q_OBJECT