diff --git a/src/core/player.cpp b/src/core/player.cpp index f1d15e382..5687aab03 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -246,7 +246,7 @@ void Player::HandleLoadResult(const UrlHandler::LoadResult &result) { item->SetTemporaryMetadata(song); app_->playlist_manager()->active()->InformOfCurrentSongChange(); } - engine_->Play(result.media_url_, song.url(), stream_change_type_, item->Metadata().has_cue(), item->Metadata().beginning_nanosec(), item->Metadata().end_nanosec()); + engine_->Play(result.media_url_, result.original_url_, stream_change_type_, item->Metadata().has_cue(), item->Metadata().beginning_nanosec(), item->Metadata().end_nanosec()); current_item_ = item; loading_async_ = QUrl(); @@ -260,6 +260,7 @@ void Player::HandleLoadResult(const UrlHandler::LoadResult &result) { loading_async_ = result.original_url_; break; } + } void Player::Next() { NextInternal(Engine::Manual); } @@ -626,8 +627,6 @@ void Player::TogglePrettyOSD() { void Player::TrackAboutToEnd() { - qLog(Debug) << __PRETTY_FUNCTION__; - // If the current track was from a URL handler then it might have special behaviour to queue up a subsequent track. // We don't want to preload (and scrobble) the next item in the playlist if it's just going to be stopped again immediately after. if (app_->playlist_manager()->active()->current_item()) { diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index e837f875e..42e7c0811 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index 0f313b58e..dbbd124fb 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -42,6 +42,7 @@ #include #include #include +#include #include class GstEngine;