fixed pingsound not playing sometimes
This commit is contained in:
@@ -143,9 +143,21 @@ bool TwitchMessageBuilder::isIgnored() const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline QMediaPlayer *getPlayer()
|
||||||
|
{
|
||||||
|
if (isGuiThread())
|
||||||
|
{
|
||||||
|
static auto player = new QMediaPlayer;
|
||||||
|
return player;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void TwitchMessageBuilder::triggerHighlights()
|
void TwitchMessageBuilder::triggerHighlights()
|
||||||
{
|
{
|
||||||
static auto player = new QMediaPlayer;
|
|
||||||
static QUrl currentPlayerUrl;
|
static QUrl currentPlayerUrl;
|
||||||
|
|
||||||
if (this->historicalMessage_)
|
if (this->historicalMessage_)
|
||||||
@@ -165,21 +177,24 @@ void TwitchMessageBuilder::triggerHighlights()
|
|||||||
|
|
||||||
if (this->highlightSound_ && resolveFocus)
|
if (this->highlightSound_ && resolveFocus)
|
||||||
{
|
{
|
||||||
// update the media player url if necessary
|
if (auto player = getPlayer())
|
||||||
QUrl highlightSoundUrl =
|
|
||||||
getSettings()->customHighlightSound
|
|
||||||
? QUrl::fromLocalFile(
|
|
||||||
getSettings()->pathHighlightSound.getValue())
|
|
||||||
: QUrl("qrc:/sounds/ping2.wav");
|
|
||||||
|
|
||||||
if (currentPlayerUrl != highlightSoundUrl)
|
|
||||||
{
|
{
|
||||||
player->setMedia(highlightSoundUrl);
|
// update the media player url if necessary
|
||||||
|
QUrl highlightSoundUrl =
|
||||||
|
getSettings()->customHighlightSound
|
||||||
|
? QUrl::fromLocalFile(
|
||||||
|
getSettings()->pathHighlightSound.getValue())
|
||||||
|
: QUrl("qrc:/sounds/ping2.wav");
|
||||||
|
|
||||||
currentPlayerUrl = highlightSoundUrl;
|
if (currentPlayerUrl != highlightSoundUrl)
|
||||||
|
{
|
||||||
|
player->setMedia(highlightSoundUrl);
|
||||||
|
|
||||||
|
currentPlayerUrl = highlightSoundUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
player->play();
|
||||||
}
|
}
|
||||||
|
|
||||||
player->play();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this->highlightAlert_)
|
if (this->highlightAlert_)
|
||||||
|
|||||||
Reference in New Issue
Block a user