mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-23 01:09:42 +01:00
Code Issues Releases Wiki Activity

Remove legacy/confusing autostart from pipeline's external resolvers

Browse Source
This commit is contained in:
Leo Franchi 2012-05-24 08:57:48 -04:00
parent 1845bbbd65
commit ac26378914
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/accounts/lastfm/LastFmAccount.cpp
View File

@ -288,7 +288,7 @@ LastFmAccount::hookupResolver()
const AtticaManager::Resolver data = AtticaManager::instance()->resolverData( res.id() );
m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( data.scriptPath, enabled() ) ) );
m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( data.scriptPath ) ) );
connect( m_resolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
}

2
src/accounts/spotify/SpotifyAccount.cpp
View File

@ -159,7 +159,7 @@ SpotifyAccount::hookupResolver()
}
qDebug() << "Starting spotify resolver with path:" << path;
m_spotifyResolver = QWeakPointer< ScriptResolver >( qobject_cast< ScriptResolver* >( Pipeline::instance()->addScriptResolver( path, enabled() ) ) );
m_spotifyResolver = QWeakPointer< ScriptResolver >( qobject_cast< ScriptResolver* >( Pipeline::instance()->addScriptResolver( path ) ) );
connect( m_spotifyResolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
connect( m_spotifyResolver.data(), SIGNAL( customMessage( QString,QVariantMap ) ), this, SLOT( resolverMessage( QString, QVariantMap ) ) );

4
src/libtomahawk/Pipeline.cpp
View File

@ -130,7 +130,7 @@ Pipeline::addExternalResolverFactory( ResolverFactoryFunc resolverFactory )
Tomahawk::ExternalResolver*
Pipeline::addScriptResolver( const QString& path, bool start )
Pipeline::addScriptResolver( const QString& path )
{
ExternalResolver* res = 0;
@ -141,8 +141,6 @@ Pipeline::addScriptResolver( const QString& path, bool start )
continue;
m_scriptResolvers << QWeakPointer< ExternalResolver >( res );
if ( start )
res->start();
break;
}

2
src/libtomahawk/Pipeline.h
View File

@ -58,7 +58,7 @@ public:
void reportArtists( QID qid, const QList< artist_ptr >& artists );
void addExternalResolverFactory( ResolverFactoryFunc resolverFactory );
Tomahawk::ExternalResolver* addScriptResolver( const QString& scriptPath, bool start = true );
Tomahawk::ExternalResolver* addScriptResolver( const QString& scriptPath );
void stopScriptResolver( const QString& scriptPath );
void removeScriptResolver( const QString& scriptPath );
QList< QWeakPointer< ExternalResolver > > scriptResolvers() const { return m_scriptResolvers; }

2
src/libtomahawk/accounts/ResolverAccount.cpp
View File

@ -126,7 +126,7 @@ ResolverAccount::hookupResolver()
{
tDebug() << "Hooking up resolver:" << configuration().value( "path" ).toString() << enabled();
m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( configuration().value( "path" ).toString(), enabled() ) ) );
m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( configuration().value( "path" ).toString() ) ) );
connect( m_resolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
// What resolver do we have here? Should only be types that are 'real' resolvers