mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-15 02:24:50 +02:00
Code Issues Releases Wiki Activity

* Removed scanningFinished's parameter.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-07-07 03:21:42 +02:00
parent a2e94ef4a7
commit 493cf75470
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/Source.cpp
View File

@@ -292,10 +292,8 @@ Source::scanningProgress( unsigned int files )
void void
Source::scanningFinished( unsigned int files ) Source::scanningFinished()
{ {
Q_UNUSED( files );
m_textStatus = QString(); m_textStatus = QString();
if ( m_updateIndexWhenSynced ) if ( m_updateIndexWhenSynced )

4
src/libtomahawk/Source.h
View File

@@ -36,6 +36,7 @@ class DatabaseCommand_LogPlayback;
class DatabaseCommand_SocialAction; class DatabaseCommand_SocialAction;
class DatabaseCommand_UpdateSearchIndex; class DatabaseCommand_UpdateSearchIndex;
class DatabaseCommand_DeleteFiles; class DatabaseCommand_DeleteFiles;
class MusicScanner;
namespace Tomahawk namespace Tomahawk
{ {
@@ -50,6 +51,7 @@ friend class ::DatabaseCommand_LogPlayback;
friend class ::DatabaseCommand_SocialAction; friend class ::DatabaseCommand_SocialAction;
friend class ::DatabaseCommand_AddFiles; friend class ::DatabaseCommand_AddFiles;
friend class ::DatabaseCommand_DeleteFiles; friend class ::DatabaseCommand_DeleteFiles;
friend class ::MusicScanner;
public: public:
enum AvatarStyle { Original, FancyStyle }; enum AvatarStyle { Original, FancyStyle };
@@ -78,7 +80,7 @@ public:
void setControlConnection( ControlConnection* cc ); void setControlConnection( ControlConnection* cc );
void scanningProgress( unsigned int files ); void scanningProgress( unsigned int files );
void scanningFinished( unsigned int files ); void scanningFinished();
unsigned int trackCount() const; unsigned int trackCount() const;

10
src/libtomahawk/filemetadata/ScanManager.cpp
View File

@@ -147,7 +147,7 @@ ScanManager::runNormalScan( bool manualFull )
tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be"; tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be";
return; return;
} }
if ( QThread::currentThread() != ScanManager::instance()->thread() ) if ( QThread::currentThread() != ScanManager::instance()->thread() )
{ {
QMetaObject::invokeMethod( this, "runNormalScan", Qt::QueuedConnection, Q_ARG( bool, manualFull ) ); QMetaObject::invokeMethod( this, "runNormalScan", Qt::QueuedConnection, Q_ARG( bool, manualFull ) );
@@ -155,7 +155,7 @@ ScanManager::runNormalScan( bool manualFull )
} }
tDebug( LOGVERBOSE ) << Q_FUNC_INFO; tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero
{ {
if ( m_queuedScanType != Full ) if ( m_queuedScanType != Full )
@@ -191,7 +191,7 @@ ScanManager::runFileScan( const QStringList &paths )
tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be"; tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be";
return; return;
} }
if ( QThread::currentThread() != ScanManager::instance()->thread() ) if ( QThread::currentThread() != ScanManager::instance()->thread() )
{ {
QMetaObject::invokeMethod( this, "runFileScan", Qt::QueuedConnection, Q_ARG( QStringList, paths ) ); QMetaObject::invokeMethod( this, "runFileScan", Qt::QueuedConnection, Q_ARG( QStringList, paths ) );
@@ -199,7 +199,7 @@ ScanManager::runFileScan( const QStringList &paths )
} }
tDebug( LOGVERBOSE ) << Q_FUNC_INFO; tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
foreach( const QString& path, paths ) foreach( const QString& path, paths )
m_currScannerPaths.insert( path ); m_currScannerPaths.insert( path );
@@ -277,7 +277,7 @@ ScanManager::scannerFinished()
m_musicScannerThreadController = 0; m_musicScannerThreadController = 0;
} }
SourceList::instance()->getLocal()->scanningFinished( 0 ); SourceList::instance()->getLocal()->scanningFinished();
emit finished(); emit finished();
if ( !m_queuedScanType == File ) if ( !m_queuedScanType == File )