Browse Source

Merge pull request #3834

Alice Weigt (1):
      refactor: Use new getSound function
pull/3832/head
sudden6 9 years ago
parent
commit
c8a08530b7
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 0
      audio/ToxIncomingCall.pcm
  2. 2
      res.qrc
  3. 2
      src/widget/form/chatform.cpp
  4. 2
      src/widget/widget.cpp

0
audio/ToxicIncomingCall.pcm → audio/ToxIncomingCall.pcm

2
res.qrc

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
</qresource>
<qresource prefix="/">
<file>audio/notification.pcm</file>
<file>audio/ToxicIncomingCall.pcm</file>
<file>audio/ToxIncomingCall.pcm</file>
<file>img/add.svg</file>
<file>img/avatar_mask.svg</file>
<file>img/contact.svg</file>

2
src/widget/form/chatform.cpp

@ -323,7 +323,7 @@ void ChatForm::onAvInvite(uint32_t FriendId, bool video) @@ -323,7 +323,7 @@ void ChatForm::onAvInvite(uint32_t FriendId, bool video)
Widget::getInstance()->newFriendMessageAlert(FriendId, false);
Audio& audio = Audio::getInstance();
audio.startLoop();
audio.playMono16Sound(QStringLiteral(":/audio/ToxicIncomingCall.pcm"));
audio.playMono16Sound(Audio::getSound(Audio::Sound::IncomingCall));
}
}

2
src/widget/widget.cpp

@ -1338,7 +1338,7 @@ bool Widget::newMessageAlert(QWidget* currentWindow, bool isActive, bool sound, @@ -1338,7 +1338,7 @@ bool Widget::newMessageAlert(QWidget* currentWindow, bool isActive, bool sound,
bool notifySound = Settings::getInstance().getNotifySound();
if (notifySound && sound && (!isBusy || busySound))
Audio::getInstance().playMono16Sound(QStringLiteral(":/audio/notification.pcm"));
Audio::getInstance().playMono16Sound(Audio::getSound(Audio::Sound::NewMessage));
}
return true;

Loading…
Cancel
Save