iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1371 from theirix/fix-qmediaplayer

Browse Source 
Fixed QMediaPlayer stuck with network streams
This commit is contained in:
CraigD
2018-09-15 22:41:15 +01:00
committed by GitHub
parent 8f7f4c8c9f 4699dee13f
commit 7e6b42c3c6
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mpd-interface/httpstream.cpp
View File

@@ -137,6 +137,8 @@ void HttpStream::toggleMute()
}
}
static const char *constUrlProperty="url";
void HttpStream::streamUrl(const QString &url)
{
MPDStatus * const status = MPDStatus::self();
@@ -149,7 +151,6 @@ void HttpStream::streamUrl(const QString &url)
player=0;
}
#else
static const char *constUrlProperty="url";
if (player && player->property(constUrlProperty).toString()!=url) {
player->stop();
player->deleteLater();
@@ -189,7 +190,15 @@ void HttpStream::updateStatus()
MPDStatus * const status = MPDStatus::self();
DBUG << status->state() << state;
if (status->state()==state) {
// evaluates to true when it is needed to start or restart media player
bool playerNeedsToStart = status->state() == MPDState_Playing &&
(QMediaPlayer::PlayingState!=player->state() ||
QMediaPlayer::InvalidMedia == player->mediaStatus() ||
QMediaPlayer::EndOfMedia == player->mediaStatus() ||
QMediaPlayer::NoMedia == player->mediaStatus());
if (status->state()==state && !playerNeedsToStart) {
return;
}
@@ -203,7 +212,14 @@ void HttpStream::updateStatus()
startTimer();
}
#else
if (QMediaPlayer::PlayingState!=player->state()) {
if (playerNeedsToStart)
{
QString url = player->property(constUrlProperty).toString();
if (!url.isEmpty())
{
DBUG << "Setting media" << url;
player->setMedia(QUrl(url));
}
player->play();
startTimer();
}