dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Player: Don't preload next song while playing module music

Browse Source 
Workaround bug in GStreamer

Fixes #787
Fixes #772
This commit is contained in:
Jonas Kvinge
2021-10-12 22:59:23 +02:00
parent bb5fe5a6d1
commit c946c1d1c4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/player.cpp
View File

@@ -338,7 +338,7 @@ void Player::HandleLoadResult(const UrlHandler::LoadResult &result) {
current_item_ = item; current_item_ = item;
play_offset_nanosec_ = 0; play_offset_nanosec_ = 0;
} }
else if (is_next) { else if (is_next && !item->Metadata().is_module_music()) {
qLog(Debug) << "Preloading next song" << next_item->Metadata().title() << result.stream_url_; qLog(Debug) << "Preloading next song" << next_item->Metadata().title() << result.stream_url_;
engine_->StartPreloading(result.stream_url_, next_item->Url(), song.has_cue(), song.beginning_nanosec(), song.end_nanosec()); engine_->StartPreloading(result.stream_url_, next_item->Url(), song.has_cue(), song.beginning_nanosec(), song.end_nanosec());
} }
@@ -856,6 +856,12 @@ void Player::TrackAboutToEnd() {
} }
} }
// Preloading any format while currently playing module music is broken in GStreamer.
// See: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/769
if (current_item_ && current_item_->Metadata().is_module_music()) {
return;
}
engine_->StartPreloading(url, next_item->Url(), next_item->Metadata().has_cue(), next_item->effective_beginning_nanosec(), next_item->effective_end_nanosec()); engine_->StartPreloading(url, next_item->Url(), next_item->Metadata().has_cue(), next_item->effective_beginning_nanosec(), next_item->effective_end_nanosec());
} }