mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 14:46:33 +02:00
Code Issues Releases Wiki Activity

* Made sure to call resolve in the right thread.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-03-16 12:22:50 +01:00
parent 1624e098ab
commit 1d2bb5be62
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/database/databaseresolver.h
View File

@@ -20,6 +20,7 @@ public:
virtual unsigned int preference() const { return 100; }
virtual unsigned int timeout() const { return 2500; }
public slots:
virtual void resolve( const Tomahawk::query_ptr& query );
private slots:

4
src/libtomahawk/resolver.h
View File

@@ -30,13 +30,15 @@ public:
virtual unsigned int weight() const = 0;
virtual unsigned int preference() const { return 100; };
virtual unsigned int timeout() const = 0;
virtual void resolve( const Tomahawk::query_ptr& query ) = 0;
//virtual QWidget * configUI() { return 0; };
//etc
PluginAPI * api() const { return m_api; }
public slots:
virtual void resolve( const Tomahawk::query_ptr& query ) = 0;
private:
PluginAPI * m_api;
};

7
src/resolvers/qtscriptresolver.cpp
View File

@@ -47,6 +47,13 @@ QtScriptResolver::~QtScriptResolver()
void
QtScriptResolver::resolve( const Tomahawk::query_ptr& query )
{
if ( QThread::currentThread() != thread() )
{
qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
QMetaObject::invokeMethod( this, "resolve", Qt::QueuedConnection, Q_ARG( Tomahawk::query_ptr, query ) );
return;
}
qDebug() << Q_FUNC_INFO << query->toString();
QString eval = QString( "resolve( '%1', '%2', '%3', '%4' );" )
.arg( query->id().replace( "'", "\\'" ) )

3
src/resolvers/qtscriptresolver.h
View File

@@ -45,9 +45,8 @@ public:
virtual unsigned int preference() const { return m_preference; }
virtual unsigned int timeout() const { return m_timeout; }
virtual void resolve( const Tomahawk::query_ptr& query );
public slots:
virtual void resolve( const Tomahawk::query_ptr& query );
virtual void stop();
private slots:

3
src/resolvers/scriptresolver.h
View File

@@ -24,13 +24,12 @@ public:
virtual unsigned int preference() const { return m_preference; }
virtual unsigned int timeout() const { return m_timeout; }
virtual void resolve( const Tomahawk::query_ptr& query );
signals:
void finished();
public slots:
virtual void stop();
virtual void resolve( const Tomahawk::query_ptr& query );
private slots:
void readStderr();