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

Remove use of NewClosure for playback resume

Browse Source
This commit is contained in:
Jonas Kvinge
2021-01-30 21:52:17 +01:00
parent 576956fa1d
commit 98d5e27a8c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/mainwindow.cpp
View File

@@ -31,6 +31,7 @@
#include <QApplication> #include <QApplication>
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QMetaObject>
#include <QThread> #include <QThread>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
@@ -71,7 +72,6 @@
#include <QClipboard> #include <QClipboard>
#include "core/logging.h" #include "core/logging.h"
#include "core/closure.h"
#include "core/networkaccessmanager.h" #include "core/networkaccessmanager.h"
#include "mainwindow.h" #include "mainwindow.h"
@@ -1424,10 +1424,18 @@ void MainWindow::ResumePlayback() {
// Set active to current to resume playback on correct playlist. // Set active to current to resume playback on correct playlist.
app_->playlist_manager()->SetActiveToCurrent(); app_->playlist_manager()->SetActiveToCurrent();
if (playback_state == Engine::Paused) { if (playback_state == Engine::Paused) {
NewClosure(app_->player(), SIGNAL(Playing()), app_->player(), SLOT(PlayPause())); std::shared_ptr<QMetaObject::Connection> connection = std::make_shared<QMetaObject::Connection>();
*connection = QObject::connect(app_->player(), &Player::Playing, app_->player(), [this, connection]() {
QObject::disconnect(*connection);
app_->player()->PlayPause();
});
} }
// Seek after we got song length. // Seek after we got song length.
NewClosure(track_position_timer_, SIGNAL(timeout()), this, SLOT(ResumePlaybackSeek(int)), playback_position); std::shared_ptr<QMetaObject::Connection> connection = std::make_shared<QMetaObject::Connection>();
*connection = QObject::connect(track_position_timer_, &QTimer::timeout, this, [this, connection, playback_position]() {
QObject::disconnect(*connection);
ResumePlaybackSeek(playback_position);
});
app_->player()->Play(); app_->player()->Play();
} }