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

* Finishing a scan should re-set the source's state.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-02-23 15:45:02 +01:00
parent 5bd32efdf6
commit 7bf4304792
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/source.cpp
View File

@@ -156,6 +156,14 @@ Source::scanningProgress( unsigned int files )
} }
void
Source::scanningFinished( unsigned int files )
{
m_textStatus = tr( "Online" );
emit stateChanged();
}
void void
Source::onStateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info ) Source::onStateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info )
{ {

1
src/libtomahawk/source.h
View File

@@ -47,6 +47,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 setOffline(); void setOffline();
void setOnline(); void setOnline();

2
src/musicscanner.cpp
View File

@@ -111,7 +111,7 @@ MusicScanner::listerFinished( const QMap<QString, unsigned int>& newmtimes )
// any remaining stuff that wasnt emitted as a batch: // any remaining stuff that wasnt emitted as a batch:
if( m_scannedfiles.length() ) if( m_scannedfiles.length() )
{ {
SourceList::instance()->getLocal()->scanningProgress( m_scanned ); SourceList::instance()->getLocal()->scanningFinished( m_scanned );
commitBatch( m_scannedfiles ); commitBatch( m_scannedfiles );
} }

5
src/tomahawkapp.cpp
View File

@@ -483,16 +483,17 @@ TomahawkApp::setupSIP()
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
#ifdef GLOOX_FOUND
//FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings //FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings
if( !arguments().contains( "--nosip" ) && TomahawkSettings::instance()->jabberAutoConnect() ) if( !arguments().contains( "--nosip" ) && TomahawkSettings::instance()->jabberAutoConnect() )
{ {
#ifdef GLOOX_FOUND
m_xmppBot = new XMPPBot( this ); m_xmppBot = new XMPPBot( this );
#endif
qDebug() << "Connecting SIP classes"; qDebug() << "Connecting SIP classes";
m_sipHandler->connectPlugins( true ); m_sipHandler->connectPlugins( true );
// m_sipHandler->setProxy( *TomahawkUtils::proxy() ); // m_sipHandler->setProxy( *TomahawkUtils::proxy() );
} }
#endif
} }