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

CollectionWatcher: Use mutex for stop and abort

Browse Source
This commit is contained in:
Jonas Kvinge
2024-08-23 20:22:18 +02:00
parent 2778a55e8e
commit be09011bb7
7 changed files with 102 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/collection/collectionwatcher.h
View File

@@ -33,6 +33,7 @@
#include <QString>
#include <QStringList>
#include <QUrl>
#include <QMutex>
#include "collectiondirectory.h"
#include "core/shared_ptr.h"
@@ -64,8 +65,9 @@ class CollectionWatcher : public QObject {
void SetRescanPausedAsync(const bool pause);
void ReloadSettingsAsync();
void Stop() { stop_requested_ = true; }
void Abort() { abort_requested_ = true; }
void Stop();
void CancelStop();
void Abort();
void ExitAsync();
@@ -178,6 +180,9 @@ class CollectionWatcher : public QObject {
void RescanSongs(const SongList &songs);
private:
bool stop_requested() const;
bool abort_requested() const;
bool stop_or_abort_requested() const;
static bool FindSongsByPath(const SongList &songs, const QString &path, SongList *out);
bool FindSongsByFingerprint(const QString &file, const QString &fingerprint, SongList *out);
static bool FindSongsByFingerprint(const QString &file, const SongList &songs, const QString &fingerprint, SongList *out);
@@ -231,7 +236,10 @@ class CollectionWatcher : public QObject {
bool overwrite_playcount_;
bool overwrite_rating_;
mutable QMutex mutex_stop_;
bool stop_requested_;
mutable QMutex mutex_abort_;
bool abort_requested_;
QMap<int, CollectionDirectory> watched_dirs_;