1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00

* Don't load SourceList twice.

This commit is contained in:
Christian Muehlhaeuser
2011-02-24 02:18:47 +01:00
parent 09234a1557
commit 15677b2f0f
2 changed files with 1 additions and 4 deletions

View File

@@ -344,7 +344,7 @@ closeconnection:
void void
Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn, const QString& key ) Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn, const QString& key )
{ {
qDebug() << "Servent::createParallelConnection, key:" << key << thread(); qDebug() << "Servent::createParallelConnection, key:" << key << thread() << orig_conn;
// if we can connect to them directly: // if we can connect to them directly:
if( orig_conn->outbound() ) if( orig_conn->outbound() )
{ {

View File

@@ -158,7 +158,6 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
new TomahawkSettings( this ); new TomahawkSettings( this );
m_audioEngine = new AudioEngine; m_audioEngine = new AudioEngine;
new ScanManager( this ); new ScanManager( this );
new Pipeline( this ); new Pipeline( this );
m_servent = new Servent( this ); m_servent = new Servent( this );
@@ -167,8 +166,6 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
qDebug() << "Init Database."; qDebug() << "Init Database.";
setupDatabase(); setupDatabase();
new SourceList( this );
qDebug() << "Init Echonest Factory."; qDebug() << "Init Echonest Factory.";
GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); GeneratorFactory::registerFactory( "echonest", new EchonestFactory );