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

* Fixed resolving regression, which caused omitting some results.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-12-15 20:58:24 +01:00
parent c3e8420b57
commit 54c203982f
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/database/databasecommand_resolve.cpp
View File

@@ -76,9 +76,9 @@ DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
typedef QPair<int, float> scorepair_t; typedef QPair<int, float> scorepair_t;
// STEP 1 // STEP 1
QList< QPair<int, float> > artists = lib->searchTable( "artist", m_query->artist(), 10 ); QList< QPair<int, float> > artists = lib->searchTable( "artist", m_query->artist() );
QList< QPair<int, float> > tracks = lib->searchTable( "track", m_query->track(), 10 ); QList< QPair<int, float> > tracks = lib->searchTable( "track", m_query->track() );
QList< QPair<int, float> > albums = lib->searchTable( "album", m_query->album(), 10 ); QList< QPair<int, float> > albums = lib->searchTable( "album", m_query->album() );
if ( artists.length() == 0 || tracks.length() == 0 ) if ( artists.length() == 0 || tracks.length() == 0 )
{ {

2
src/libtomahawk/network/servent.cpp
View File

@@ -378,7 +378,7 @@ Servent::readyRead()
} }
// they connected to us and want something we are offering // they connected to us and want something we are offering
if( conntype == "accept-offer" || "push-offer" ) if ( conntype == "accept-offer" || conntype == "push-offer" )
{ {
sock->_msg.clear(); sock->_msg.clear();
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << key << nodeid << "socket peer address = " << sock->peerAddress() << "socket peer name = " << sock->peerName(); tDebug( LOGVERBOSE ) << Q_FUNC_INFO << key << nodeid << "socket peer address = " << sock->peerAddress() << "socket peer name = " << sock->peerName();

2
src/libtomahawk/resolvers/qtscriptresolver.h
View File

@@ -53,6 +53,7 @@ public:
Q_INVOKABLE void addCustomUrlHandler( const QString& protocol, const QString& callbackFuncName ); Q_INVOKABLE void addCustomUrlHandler( const QString& protocol, const QString& callbackFuncName );
QSharedPointer<QIODevice> customIODeviceFactory( const Tomahawk::result_ptr& result ); QSharedPointer<QIODevice> customIODeviceFactory( const Tomahawk::result_ptr& result );
public slots: public slots:
QByteArray readRaw( const QString& fileName ); QByteArray readRaw( const QString& fileName );
QString readBase64( const QString& fileName ); QString readBase64( const QString& fileName );
@@ -66,7 +67,6 @@ public slots:
void addTrackResults( const QVariantMap& results ); void addTrackResults( const QVariantMap& results );
private: private:
QString m_scriptPath, m_urlCallback; QString m_scriptPath, m_urlCallback;
QVariantMap m_resolverConfig; QVariantMap m_resolverConfig;

1
src/tomahawkapp.cpp
View File

@@ -226,7 +226,6 @@ TomahawkApp::init()
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
EchonestGenerator::setupCatalogs(); EchonestGenerator::setupCatalogs();
if ( !m_headless ) if ( !m_headless )
{ {
tDebug() << "Init MainWindow."; tDebug() << "Init MainWindow.";