From ffe6a81b9ae11a08fcc43b1ed8962f84f75ab21c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 26 Mar 2023 00:10:29 +0100
Subject: [PATCH] Collection: Always use Idle priority for watcher

---
 src/collection/collection.cpp | 14 +++-----------
 src/collection/collection.h   |  5 +----
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/collection/collection.cpp b/src/collection/collection.cpp
index 44048cea6..4d2a0ae66 100644
--- a/src/collection/collection.cpp
+++ b/src/collection/collection.cpp
@@ -58,8 +58,6 @@ SCollection::SCollection(Application *app, QObject *parent)
       watcher_(nullptr),
       watcher_thread_(nullptr),
       original_thread_(nullptr),
-      io_priority_(Utilities::IoPriority::IOPRIO_CLASS_IDLE),
-      thread_priority_(QThread::Priority::IdlePriority),
       save_playcounts_to_files_(false),
       save_ratings_to_files_(false) {
 
@@ -96,17 +94,13 @@ void SCollection::Init() {
   watcher_ = new CollectionWatcher(Song::Source::Collection);
   watcher_thread_ = new Thread(this);
 
-#ifndef Q_OS_WIN32
-  if (io_priority_ != Utilities::IoPriority::IOPRIO_CLASS_NONE) {
-    watcher_thread_->SetIoPriority(io_priority_);
-  }
-#endif
+  watcher_thread_->SetIoPriority(Utilities::IoPriority::IOPRIO_CLASS_IDLE);
 
   watcher_->moveToThread(watcher_thread_);
 
-  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_ << "with I/O priority" << static_cast<int>(io_priority_) << "and thread priority" << thread_priority_;
+  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_;
 
-  watcher_thread_->start(thread_priority_);
+  watcher_thread_->start(QThread::IdlePriority);
 
   watcher_->set_backend(backend_);
   watcher_->set_task_manager(app_->task_manager());
@@ -186,8 +180,6 @@ void SCollection::ReloadSettings() {
 
   QSettings s;
   s.beginGroup(CollectionSettingsPage::kSettingsGroup);
-  io_priority_ = static_cast<Utilities::IoPriority>(s.value("io_priority", static_cast<int>(Utilities::IoPriority::IOPRIO_CLASS_IDLE)).toInt());
-  thread_priority_ = static_cast<QThread::Priority>(s.value("thread_priority", QThread::Priority::IdlePriority).toInt());
   save_playcounts_to_files_ = s.value("save_playcounts", false).toBool();
   save_ratings_to_files_ = s.value("save_ratings", false).toBool();
   s.endGroup();
diff --git a/src/collection/collection.h b/src/collection/collection.h
index 688081ea7..54ad904cd 100644
--- a/src/collection/collection.h
+++ b/src/collection/collection.h
@@ -28,11 +28,10 @@
 #include <QList>
 #include <QHash>
 #include <QString>
-#include <QThread>
 
 #include "core/song.h"
-#include "utilities/threadutils.h"
 
+class QThread;
 class Application;
 class Thread;
 class CollectionBackend;
@@ -99,8 +98,6 @@ class SCollection : public QObject {
 
   QList<QObject*> wait_for_exit_;
 
-  Utilities::IoPriority io_priority_;
-  QThread::Priority thread_priority_;
   bool save_playcounts_to_files_;
   bool save_ratings_to_files_;
 };