mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 14:46:33 +02:00
Code Issues Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Jeff Mitchell
2011-05-12 15:07:04 -04:00
parent f8d30b5d24
commit dc8f52076d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -14,12 +14,6 @@ Version 0.1.0:
played playlists. played playlists.
* Browse and play collections in our snappy tree-view, which also shows * Browse and play collections in our snappy tree-view, which also shows
images for artists and albums. 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 crash that could occur when playing a track from a browser.
* Fixed a crash caused by sources going on- or offline. * Fixed a crash caused by sources going on- or offline.
* (OS X) Open configuration dialogs as sliding sheets. * (OS X) Open configuration dialogs as sliding sheets.

3
src/scanmanager.cpp
View File

@@ -65,6 +65,9 @@ ScanManager::ScanManager( QObject* parent )
connect( m_deferredScanTimer, SIGNAL( timeout() ), SLOT( deferredScanTimeout() ) ); connect( m_deferredScanTimer, SIGNAL( timeout() ), SLOT( deferredScanTimeout() ) );
connect( m_dirWatcher, SIGNAL( directoryChanged( const QString & ) ), SLOT( handleChangedDir( const QString & ) ) ); 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() ) if ( TomahawkSettings::instance()->hasScannerPaths() )
{ {
m_currScannerPaths = TomahawkSettings::instance()->scannerPaths(); m_currScannerPaths = TomahawkSettings::instance()->scannerPaths();

3
src/settingsdialog.cpp
View File

@@ -107,7 +107,10 @@ SettingsDialog::SettingsDialog( QWidget *parent )
ui->lineEditMusicPath_2->setText( QDesktopServices::storageLocation( QDesktopServices::MusicLocation ) ); 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->setChecked( s->watchForChanges() );
ui->checkBoxWatchForChanges->setVisible( false );
// LAST FM // LAST FM
ui->checkBoxEnableLastfm->setChecked( s->scrobblingEnabled() ); ui->checkBoxEnableLastfm->setChecked( s->scrobblingEnabled() );