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

Remove unused live scanning option

Browse Source
This commit is contained in:
Jonas Kvinge
2020-11-21 09:40:48 +01:00
parent 2786a1a97e
commit bf04c45ebf
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/collection/collectionwatcher.cpp
View File

@@ -76,7 +76,6 @@ CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent)
scan_on_startup_(true), scan_on_startup_(true),
monitor_(true), monitor_(true),
mark_songs_unavailable_(false), mark_songs_unavailable_(false),
live_scanning_(false),
stop_requested_(false), stop_requested_(false),
rescan_in_progress_(false), rescan_in_progress_(false),
rescan_timer_(new QTimer(this)), rescan_timer_(new QTimer(this)),
@@ -480,8 +479,6 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
t->AddToProgress(1); t->AddToProgress(1);
if (live_scanning_) t->CommitNewOrUpdatedSongs();
// Recurse into the new subdirs that we found // Recurse into the new subdirs that we found
t->AddToProgressMax(my_new_subdirs.count()); t->AddToProgressMax(my_new_subdirs.count());
for (const Subdirectory &my_new_subdir : my_new_subdirs) { for (const Subdirectory &my_new_subdir : my_new_subdirs) {

1
src/collection/collectionwatcher.h
View File

@@ -195,7 +195,6 @@ class CollectionWatcher : public QObject {
bool scan_on_startup_; bool scan_on_startup_;
bool monitor_; bool monitor_;
bool mark_songs_unavailable_; bool mark_songs_unavailable_;
bool live_scanning_;
bool stop_requested_; bool stop_requested_;
bool rescan_in_progress_; // True if RescanTracksNow() has been called and is working. bool rescan_in_progress_; // True if RescanTracksNow() has been called and is working.

4
src/settings/collectionsettingspage.cpp
View File

@@ -88,8 +88,6 @@ CollectionSettingsPage::CollectionSettingsPage(SettingsDialog *dialog)
connect(ui_->button_clear_disk_cache, SIGNAL(clicked()), dialog->app(), SIGNAL(ClearPixmapDiskCache())); connect(ui_->button_clear_disk_cache, SIGNAL(clicked()), dialog->app(), SIGNAL(ClearPixmapDiskCache()));
connect(ui_->button_clear_disk_cache, SIGNAL(clicked()), SLOT(ClearPixmapDiskCache())); connect(ui_->button_clear_disk_cache, SIGNAL(clicked()), SLOT(ClearPixmapDiskCache()));
ui_->live_scanning->hide();
} }
CollectionSettingsPage::~CollectionSettingsPage() { delete ui_; } CollectionSettingsPage::~CollectionSettingsPage() { delete ui_; }
@@ -157,7 +155,6 @@ void CollectionSettingsPage::Load() {
ui_->startup_scan->setChecked(s.value("startup_scan", true).toBool()); ui_->startup_scan->setChecked(s.value("startup_scan", true).toBool());
ui_->monitor->setChecked(s.value("monitor", true).toBool()); ui_->monitor->setChecked(s.value("monitor", true).toBool());
ui_->mark_songs_unavailable->setChecked(s.value("mark_songs_unavailable", false).toBool()); ui_->mark_songs_unavailable->setChecked(s.value("mark_songs_unavailable", false).toBool());
ui_->live_scanning->setChecked(s.value("live_scanning", false).toBool());
QStringList filters = s.value("cover_art_patterns", QStringList() << "front" << "cover").toStringList(); QStringList filters = s.value("cover_art_patterns", QStringList() << "front" << "cover").toStringList();
ui_->cover_art_patterns->setText(filters.join(",")); ui_->cover_art_patterns->setText(filters.join(","));
@@ -209,7 +206,6 @@ void CollectionSettingsPage::Save() {
s.setValue("startup_scan", ui_->startup_scan->isChecked()); s.setValue("startup_scan", ui_->startup_scan->isChecked());
s.setValue("monitor", ui_->monitor->isChecked()); s.setValue("monitor", ui_->monitor->isChecked());
s.setValue("mark_songs_unavailable", ui_->mark_songs_unavailable->isChecked()); s.setValue("mark_songs_unavailable", ui_->mark_songs_unavailable->isChecked());
s.setValue("live_scanning", ui_->live_scanning->isChecked());
QString filter_text = ui_->cover_art_patterns->text(); QString filter_text = ui_->cover_art_patterns->text();

8
src/settings/collectionsettingspage.ui
View File

@@ -99,13 +99,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="live_scanning">
<property name="text">
<string>Use live scanning</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="label_preferred_cover_filenames"> <widget class="QLabel" name="label_preferred_cover_filenames">
<property name="text"> <property name="text">
@@ -466,7 +459,6 @@ If there are no matches then it will use the largest image in the directory.</st
<tabstop>startup_scan</tabstop> <tabstop>startup_scan</tabstop>
<tabstop>monitor</tabstop> <tabstop>monitor</tabstop>
<tabstop>mark_songs_unavailable</tabstop> <tabstop>mark_songs_unavailable</tabstop>
<tabstop>live_scanning</tabstop>
<tabstop>cover_art_patterns</tabstop> <tabstop>cover_art_patterns</tabstop>
<tabstop>auto_open</tabstop> <tabstop>auto_open</tabstop>
<tabstop>pretty_covers</tabstop> <tabstop>pretty_covers</tabstop>