From dc8f52076dc41f35c0fb04044d04bee149c94181 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 12 May 2011 15:07:04 -0400 Subject: [PATCH] Remove option to turn on watch changes. QFileSystemWatcher is now deprecated and doesn't work right anyways. The logic is still there as it's mostly fine, but we need a new method for tracking. --- ChangeLog | 6 ------ src/scanmanager.cpp | 3 +++ src/settingsdialog.cpp | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4968eaed..6fb3e7b88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,12 +14,6 @@ Version 0.1.0: played playlists. * Browse and play collections in our snappy tree-view, which also shows images for artists and albums. - * Watch folders for changes and automatically update your collection. This - is on by default; you can turn it off on the Local Music tab in the - settings dialog. Note that this triggers only on files or folders being - added to or removed from folders; it is not watch individual files as - most OSes can't support enough file watches to handle a normal-sized - music collection. * Fixed crash that could occur when playing a track from a browser. * Fixed a crash caused by sources going on- or offline. * (OS X) Open configuration dialogs as sliding sheets. diff --git a/src/scanmanager.cpp b/src/scanmanager.cpp index 057532ab2..cf12153c9 100644 --- a/src/scanmanager.cpp +++ b/src/scanmanager.cpp @@ -65,6 +65,9 @@ ScanManager::ScanManager( QObject* parent ) connect( m_deferredScanTimer, SIGNAL( timeout() ), SLOT( deferredScanTimeout() ) ); connect( m_dirWatcher, SIGNAL( directoryChanged( const QString & ) ), SLOT( handleChangedDir( const QString & ) ) ); + // FIXME: Disable this until we find something nondeprecated and working (e.g. not QFileSystemWatcher) + TomahawkSettings::instance()->setWatchForChanges( false ); + if ( TomahawkSettings::instance()->hasScannerPaths() ) { m_currScannerPaths = TomahawkSettings::instance()->scannerPaths(); diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 97d60aed5..416935420 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -107,7 +107,10 @@ SettingsDialog::SettingsDialog( QWidget *parent ) ui->lineEditMusicPath_2->setText( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ); } + // WATCH CHANGES + // FIXME: QFileSystemWatcher is broken (as we know) and deprecated. Find another way. ui->checkBoxWatchForChanges->setChecked( s->watchForChanges() ); + ui->checkBoxWatchForChanges->setVisible( false ); // LAST FM ui->checkBoxEnableLastfm->setChecked( s->scrobblingEnabled() );