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

refactor(chatform): Remove Audio dependencies from ChatForm

Browse Source
This commit is contained in:
Diadlo 2017-05-04 22:42:39 +03:00
parent 695abadd7c
commit 7e3ad7ba87
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
4 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,7 +386,6 @@ void ChatForm::onAvEnd(uint32_t friendId)
netcam->showNormal();
}
Audio::getInstance().stopLoop();
updateCallButtons();
stopCounter();
hideNetcam();
@ -406,10 +405,11 @@ void ChatForm::showOutgoingCall(bool video)
void ChatForm::onAnswerCallTriggered()
{
delete callConfirm;
Audio::getInstance().stopLoop();
uint32_t friendId = f->getFriendId();
emit acceptCall(friendId);
updateCallButtons();
CoreAV* av = Core::getInstance()->getAv();
uint32_t friendId = f->getFriendId();
if (!av->answerCall(friendId)) {
updateCallButtons();
stopCounter();
@ -423,9 +423,7 @@ void ChatForm::onAnswerCallTriggered()
void ChatForm::onRejectCallTriggered()
{
delete callConfirm;
Audio::getInstance().stopLoop();
CoreAV* av = Core::getInstance()->getAv();
av->cancelCall(f->getFriendId());
emit rejectCall(f->getFriendId());
}
void ChatForm::onCallTriggered()

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

@ -58,6 +58,8 @@ public:
signals:
void aliasChanged(const QString& alias);
void incomingNotification(uint32_t friendId);
void rejectCall(uint32_t friendId);
void acceptCall(uint32_t friendId);
public slots:
void startFileSend(ToxFile file);

22
src/widget/widget.cpp
View File

@ -234,6 +234,9 @@ void Widget::init()
const Settings& s = Settings::getInstance();
Core* core = Nexus::getCore();
CoreAV* av = core->getAv();
connect(av, &CoreAV::avEnd, this, &Widget::onCallEnd);
connect(core, &Core::fileDownloadFinished, filesForm, &FilesForm::onFileDownloadComplete);
connect(core, &Core::fileUploadFinished, filesForm, &FilesForm::onFileUploadComplete);
connect(core, &Core::selfAvatarChanged, profileForm, &ProfileForm::onSelfAvatarLoaded);
@ -928,6 +931,23 @@ void Widget::incomingNotification(uint32_t friendId)
audio.playMono16Sound(Audio::getSound(Audio::Sound::IncomingCall));
}
void Widget::onRejectCall(uint32_t friendId)
{
Audio::getInstance().stopLoop();
CoreAV* av = Core::getInstance()->getAv();
av->cancelCall(friendId);
}
void Widget::onAcceptCall(uint32_t friendId)
{
Audio::getInstance().stopLoop();
}
void Widget::onCallEnd(uint32_t friendId)
{
Audio::getInstance().stopLoop();
}
void Widget::addFriend(int friendId, const ToxPk& friendPk)
{
Friend* newfriend = FriendList::addFriend(friendId, friendPk);
@ -954,6 +974,8 @@ void Widget::addFriend(int friendId, const ToxPk& friendPk)
connect(newfriend, &Friend::nameChanged, this, &Widget::onFriendAliasChanged);
connect(friendForm, &ChatForm::incomingNotification, this, &Widget::incomingNotification);
connect(friendForm, &ChatForm::rejectCall, this, &Widget::onRejectCall);
connect(friendForm, &ChatForm::acceptCall, this, &Widget::onAcceptCall);
connect(widget, &FriendWidget::chatroomWidgetClicked, this, &Widget::onChatroomWidgetClicked);
connect(widget, &FriendWidget::chatroomWidgetClicked, friendForm, &ChatForm::focusInput);

3
src/widget/widget.h
View File

@ -218,6 +218,9 @@ private slots:
void groupInvitesClear();
void onDialogShown(GenericChatroomWidget* widget);
void incomingNotification(uint32_t friendId);
void onRejectCall(uint32_t friendId);
void onAcceptCall(uint32_t friendId);
void onCallEnd(uint32_t friendId);
private:
bool newMessageAlert(QWidget* currentWindow, bool isActive, bool sound = true, bool notify = true);