StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

feat(call): add call end sound

Browse Source 
Fix #4905
This commit is contained in:
Anthony Bilinski 2018-04-05 01:23:39 -07:00
parent 5dc4e6de81
commit 65896e4501
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
7 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
audio/ToxEndCall.pcm Normal file
View File

Binary file not shown.

1
res.qrc
View File

@ -9,6 +9,7 @@
<file>audio/notification.pcm</file>
<file>audio/ToxIncomingCall.pcm</file>
<file>audio/ToxOutgoingCall.pcm</file>
<file>audio/ToxEndCall.pcm</file>
<file>img/add.svg</file>
<file>img/avatar_mask.svg</file>
<file>img/contact.svg</file>

5
src/audio/audio.h
View File

@ -40,7 +40,8 @@ public:
NewMessage,
Test,
IncomingCall,
OutgoingCall
OutgoingCall,
CallEnd
};
inline static QString getSound(Sound s)
@ -54,6 +55,8 @@ public:
return QStringLiteral(":/audio/ToxIncomingCall.pcm");
case Sound::OutgoingCall:
return QStringLiteral(":/audio/ToxOutgoingCall.pcm");
case Sound::CallEnd:
return QStringLiteral(":/audio/ToxEndCall.pcm");
}
assert(false);
return QString();

1
src/widget/form/chatform.cpp
View File

@ -402,6 +402,7 @@ void ChatForm::onAvEnd(uint32_t friendId, bool error)
}
emit stopNotification();
emit endCallNotification();
updateCallButtons();
stopCounter(error);
hideNetcam();

1
src/widget/form/chatform.h
View File

@ -60,6 +60,7 @@ signals:
void incomingNotification(uint32_t friendId);
void outgoingNotification();
void stopNotification();
void endCallNotification();
void rejectCall(uint32_t friendId);
void acceptCall(uint32_t friendId);

7
src/widget/widget.cpp
View File

@ -955,6 +955,12 @@ void Widget::outgoingNotification()
audio.playMono16Sound(Audio::getSound(Audio::Sound::OutgoingCall));
}
void Widget::onCallEnd()
{
Audio& audio = Audio::getInstance();
audio.playMono16Sound(Audio::getSound(Audio::Sound::CallEnd));
}
/**
* @brief Widget::onStopNotification Stop the notification sound.
*/
@ -997,6 +1003,7 @@ void Widget::addFriend(uint32_t friendId, const ToxPk& friendPk)
connect(friendForm, &ChatForm::incomingNotification, this, &Widget::incomingNotification);
connect(friendForm, &ChatForm::outgoingNotification, this, &Widget::outgoingNotification);
connect(friendForm, &ChatForm::stopNotification, this, &Widget::onStopNotification);
connect(friendForm, &ChatForm::endCallNotification, this, &Widget::onCallEnd);
connect(friendForm, &ChatForm::rejectCall, this, &Widget::onRejectCall);
connect(widget, &FriendWidget::newWindowOpened, this, &Widget::openNewDialog);

1
src/widget/widget.h
View File

@ -218,6 +218,7 @@ private slots:
void groupInvitesClear();
void onDialogShown(GenericChatroomWidget* widget);
void outgoingNotification();
void onCallEnd();
void incomingNotification(uint32_t friendId);
void onRejectCall(uint32_t friendId);
void onStopNotification();