noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

ping sound media doesn't get recreated on every message

Browse source
This commit is contained in:
fourtf 2017-12-18 17:57:56 +01:00
parent cca065f0f9
commit 625e33d654
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/twitch/twitchmessagebuilder.cpp
View file

@ -364,6 +364,7 @@ void TwitchMessageBuilder::appendUsername()
void TwitchMessageBuilder::parseHighlights() void TwitchMessageBuilder::parseHighlights()
{ {
static auto player = new QMediaPlayer; static auto player = new QMediaPlayer;
static QUrl currentPlayerUrl;
SettingsManager &settings = SettingsManager::getInstance(); SettingsManager &settings = SettingsManager::getInstance();
static pajlada::Settings::Setting<std::string> currentUser("/accounts/current"); static pajlada::Settings::Setting<std::string> currentUser("/accounts/current");
@ -374,10 +375,18 @@ void TwitchMessageBuilder::parseHighlights()
return; return;
} }
// update the media player url if necessary
QUrl highlightSoundUrl;
if (settings.customHighlightSound) { if (settings.customHighlightSound) {
player->setMedia(QUrl(settings.pathHighlightSound.get())); highlightSoundUrl = QUrl(settings.pathHighlightSound.get());
} else { } else {
player->setMedia(QUrl("qrc:/sounds/ping2.wav")); highlightSoundUrl = QUrl("qrc:/sounds/ping2.wav");
}
if (currentPlayerUrl != highlightSoundUrl) {
player->setMedia(highlightSoundUrl);
currentPlayerUrl = highlightSoundUrl;
} }
struct Highlight { struct Highlight {