Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6475 from rohtie/bugfix-position-not-resumed 

Fix resuming playback position on startup
This commit is contained in:
John Maguire 2019-12-15 11:21:00 +00:00 committed by GitHub
parent 672b90659b 715da8909f
commit 9eeb6d3758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/mainwindow.cpp
View File

@ -1342,7 +1342,19 @@ void MainWindow::ResumePlayback() {
app_->player()->Play(); app_->player()->Play();
app_->player()->SeekTo(saved_playback_position_); connect(track_position_timer_, SIGNAL(timeout()),
SLOT(ResumePlaybackPosition()));
}
void MainWindow::ResumePlaybackPosition() {
// We must wait until the song has a length because
// seeking a song without length does not work
if (app_->player()->engine()->length_nanosec() > 0) {
disconnect(track_position_timer_, SIGNAL(timeout()), this,
SLOT(ResumePlaybackPosition()));
app_->player()->SeekTo(saved_playback_position_);
}
} }
void MainWindow::PlayIndex(const QModelIndex& index) { void MainWindow::PlayIndex(const QModelIndex& index) {

1
src/ui/mainwindow.h
View File

@ -271,6 +271,7 @@ signals:
void SavePlaybackStatus(QSettings* settings); void SavePlaybackStatus(QSettings* settings);
void LoadPlaybackStatus(); void LoadPlaybackStatus();
void ResumePlayback(); void ResumePlayback();
void ResumePlaybackPosition();
void AddSongInfoGenerator(smart_playlists::GeneratorPtr gen); void AddSongInfoGenerator(smart_playlists::GeneratorPtr gen);