mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:tomahawk-player/tomahawk

Browse Source
This commit is contained in:
Leo Franchi
2011-03-06 11:09:32 -05:00
parent 2612a4926e 547dc76ca8
commit 597a9e5efd
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/query.cpp
View File

@@ -44,7 +44,7 @@ Query::addResults( const QList< Tomahawk::result_ptr >& newresults )
{
bool becameSolved = false;
{
QMutexLocker lock( &m_mut );
// QMutexLocker lock( &m_mut );
m_results.append( newresults );
qStableSort( m_results.begin(), m_results.end(), Query::resultSorter );
@@ -81,7 +81,7 @@ void
Query::removeResult( const Tomahawk::result_ptr& result )
{
{
QMutexLocker lock( &m_mut );
// QMutexLocker lock( &m_mut );
m_results.removeAll( result );
}
@@ -101,7 +101,7 @@ Query::onResolvingFinished()
QList< result_ptr >
Query::results() const
{
QMutexLocker lock( &m_mut );
// QMutexLocker lock( &m_mut );
return m_results;
}
@@ -109,7 +109,7 @@ Query::results() const
unsigned int
Query::numResults() const
{
QMutexLocker lock( &m_mut );
// QMutexLocker lock( &m_mut );
return m_results.length();
}
@@ -152,12 +152,12 @@ Query::checkResults()
// hook up signals, and check solved status
foreach( const result_ptr& rp, m_results )
{
if ( !m_solved && rp->score() > 0.99 )
if ( !m_solved && rp->score() > 0.99 && rp->collection()->source()->isOnline() )
{
m_solved = true;
becameSolved = true;
}
if ( rp->score() > 0.99 )
if ( rp->score() > 0.99 && rp->collection()->source()->isOnline() )
{
becameUnsolved = false;
}
@@ -166,7 +166,7 @@ Query::checkResults()
if ( m_solved && becameUnsolved )
{
m_solved = false;
emit solvedStateChanged( true );
emit solvedStateChanged( false );
}
if( becameSolved )

1
src/libtomahawk/query.h
View File

@@ -85,7 +85,6 @@ private:
void clearResults();
void checkResults();
mutable QMutex m_mut;
QList< Tomahawk::result_ptr > m_results;
bool m_solved;
mutable QID m_qid;