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

Don't send now playing twice

Browse Source 
Fixes #548
This commit is contained in:
Jonas Kvinge
2020-09-28 17:47:45 +02:00
parent 4457e416db
commit b63030d302
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/player.cpp
View File

@@ -589,9 +589,6 @@ void Player::PlayAt(const int index, Engine::TrackChangeFlags change, const Play
} }
else { else {
qLog(Debug) << "Playing song" << current_item_->Metadata().title() << url; qLog(Debug) << "Playing song" << current_item_->Metadata().title() << url;
if (current_item_->HasTemporaryMetadata()) {
app_->playlist_manager()->active()->InformOfCurrentSongChange(autoscroll);
}
engine_->Play(url, current_item_->Url(), change, current_item_->Metadata().has_cue(), current_item_->effective_beginning_nanosec(), current_item_->effective_end_nanosec()); engine_->Play(url, current_item_->Url(), change, current_item_->Metadata().has_cue(), current_item_->effective_beginning_nanosec(), current_item_->effective_end_nanosec());
} }

3
src/playlist/playlist.cpp
View File

@@ -597,6 +597,7 @@ void Playlist::set_current_row(const int i, const AutoScroll autoscroll, const b
QModelIndex old_current_item_index = current_item_index_; QModelIndex old_current_item_index = current_item_index_;
ClearStreamMetadata(); ClearStreamMetadata();
nowplaying_ = false;
if (next_row() != -1 && next_row() != i) { if (next_row() != -1 && next_row() != i) {
PlaylistItemPtr next_item = item_at(next_row()); PlaylistItemPtr next_item = item_at(next_row());
@@ -1613,6 +1614,7 @@ void Playlist::SetStreamMetadata(const QUrl &url, const Song &song, const bool m
} }
else { else {
update_scrobble_point = true; update_scrobble_point = true;
nowplaying_ = false;
InformOfCurrentSongChange(AutoScroll_Never); InformOfCurrentSongChange(AutoScroll_Never);
} }
@@ -2145,7 +2147,6 @@ void Playlist::UpdateScrobblePoint(const qint64 seek_point_nanosec) {
} }
} }
nowplaying_ = false;
scrobbled_ = false; scrobbled_ = false;
} }