Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-14 18:03:44 +01:00
Code Issues Releases Wiki Activity

songloader: Make sure timeout timer is started from correct thread

Browse Source
This commit is contained in:
Jonas Kvinge 2021-07-10 21:48:31 +02:00
parent 2bee41e90e
commit 432b0f3e54
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/songloader.cpp
View File

@ -112,6 +112,8 @@ SongLoader::~SongLoader() {
SongLoader::Result SongLoader::Load(const QUrl &url) { SongLoader::Result SongLoader::Load(const QUrl &url) {
if (url.isEmpty()) return Error;
url_ = url; url_ = url;
if (url_.isLocalFile()) { if (url_.isLocalFile()) {
@ -425,6 +427,7 @@ void SongLoader::StopTypefind() {
QBuffer buf(&buffer_); QBuffer buf(&buffer_);
buf.open(QIODevice::ReadOnly); buf.open(QIODevice::ReadOnly);
songs_ = parser_->Load(&buf); songs_ = parser_->Load(&buf);
buf.close();
} }
else if (success_) { else if (success_) {
@ -449,7 +452,7 @@ SongLoader::Result SongLoader::LoadRemote() {
// Otherwise wait to get 512 bytes of data and do magic on it - if the magic fails then we don't know what it is so return failure. // Otherwise wait to get 512 bytes of data and do magic on it - if the magic fails then we don't know what it is so return failure.
// If the magic succeeds then we know for sure it's a playlist - so read the rest of the file, parse the playlist and return success. // If the magic succeeds then we know for sure it's a playlist - so read the rest of the file, parse the playlist and return success.
timeout_timer_->start(timeout_); ScheduleTimeoutAsync();
// Create the pipeline - it gets unreffed if it goes out of scope // Create the pipeline - it gets unreffed if it goes out of scope
std::shared_ptr<GstElement> pipeline(gst_pipeline_new(nullptr), std::bind(&gst_object_unref, std::placeholders::_1)); std::shared_ptr<GstElement> pipeline(gst_pipeline_new(nullptr), std::bind(&gst_object_unref, std::placeholders::_1));
@ -696,3 +699,21 @@ void SongLoader::StopTypefindAsync(bool success) {
} }
#endif #endif
void SongLoader::ScheduleTimeoutAsync() {
if (QThread::currentThread() == thread()) {
ScheduleTimeout();
}
else {
metaObject()->invokeMethod(this, "ScheduleTimeout", Qt::QueuedConnection);
}
}
void SongLoader::ScheduleTimeout() {
timeout_timer_->start(timeout_);
}

3
src/core/songloader.h
View File

@ -92,6 +92,7 @@ class SongLoader : public QObject {
void LoadRemoteFinished(); void LoadRemoteFinished();
private slots: private slots:
void ScheduleTimeout();
void Timeout(); void Timeout();
void StopTypefind(); void StopTypefind();
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER) #if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER)
@ -127,6 +128,8 @@ class SongLoader : public QObject {
bool IsPipelinePlaying(); bool IsPipelinePlaying();
#endif #endif
void ScheduleTimeoutAsync();
private: private:
static QSet<QString> sRawUriSchemes; static QSet<QString> sRawUriSchemes;