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

* Tweaked shutdown order.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-05-29 11:42:32 +02:00
parent c24e90c978
commit 9d92201c0c
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/audio/audioengine.cpp
View File

@@ -64,7 +64,8 @@ AudioEngine::~AudioEngine()
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
stop(); m_mediaObject->stop();
// stop();
delete m_audioOutput; delete m_audioOutput;
delete m_mediaObject; delete m_mediaObject;

15
src/tomahawkapp.cpp
View File

@@ -330,26 +330,21 @@ TomahawkApp::~TomahawkApp()
#ifndef TOMAHAWK_HEADLESS #ifndef TOMAHAWK_HEADLESS
delete m_mainwindow; delete m_mainwindow;
delete m_audioEngine;
#endif #endif
delete m_infoSystem; delete m_infoSystem;
//FIXME: delete GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); ? //FIXME: delete GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); ?
delete m_database; delete SipHandler::instance();
delete SipHandler::instance();
delete m_servent; delete m_servent;
Pipeline::instance()->stop();
delete Pipeline::instance();
delete m_scanManager; delete m_scanManager;
delete m_database;
#ifndef TOMAHAWK_HEADLESS Pipeline::instance()->stop();
delete m_audioEngine; delete Pipeline::instance();
#endif
delete TomahawkUtils::proxyFactory(); delete TomahawkUtils::proxyFactory();
delete TomahawkUtils::nam(); delete TomahawkUtils::nam();