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

* Init Database earlier.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-24 11:15:54 +02:00
parent f8ca1ac994
commit 9171de999b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/TomahawkApp.cpp
View File

@@ -200,7 +200,7 @@ TomahawkApp::init()
QFontMetrics fm( f ); QFontMetrics fm( f );
TomahawkUtils::setHeaderHeight( fm.height() + 8 ); TomahawkUtils::setHeaderHeight( fm.height() + 8 );
#endif #endif
TomahawkUtils::setHeadless( m_headless ); TomahawkUtils::setHeadless( m_headless );
TomahawkSettings* s = TomahawkSettings::instance(); TomahawkSettings* s = TomahawkSettings::instance();
@@ -210,11 +210,18 @@ TomahawkApp::init()
Q_UNUSED( TomahawkUtils::nam() ); Q_UNUSED( TomahawkUtils::nam() );
m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine ); m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );
// init pipeline and resolver factories // init pipeline and resolver factories
new Pipeline(); new Pipeline();
m_servent = QWeakPointer<Servent>( new Servent( this ) );
connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) );
tDebug() << "Init Database.";
initDatabase();
m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
Pipeline::instance()->addExternalResolverFactory( boost::bind( &QtScriptResolver::factory, _1 ) ); Pipeline::instance()->addExternalResolverFactory( boost::bind( &QtScriptResolver::factory, _1 ) );
Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1 ) ); Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1 ) );
@@ -223,12 +230,6 @@ TomahawkApp::init()
connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection ); connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection );
#endif #endif
m_servent = QWeakPointer<Servent>( new Servent( this ) );
connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) );
tDebug() << "Init Database.";
initDatabase();
QByteArray magic = QByteArray::fromBase64( enApiSecret ); QByteArray magic = QByteArray::fromBase64( enApiSecret );
QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() ); QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() );
int length = magic.length(), n2 = wand.length(); int length = magic.length(), n2 = wand.length();