mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

* Forgot to initialize AudioEngine in headless mode.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2010-11-14 06:18:55 +01:00
parent b4245f58f6
commit 09351e6356
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tomahawkapp.cpp
View File

@@ -18,11 +18,11 @@
#include "web/api_v1.h" #include "web/api_v1.h"
#include "scriptresolver.h" #include "scriptresolver.h"
#include "audioengine.h"
#include "controlconnection.h" #include "controlconnection.h"
#include "tomahawkzeroconf.h" #include "tomahawkzeroconf.h"
#ifndef TOMAHAWK_HEADLESS #ifndef TOMAHAWK_HEADLESS
#include "audioengine.h"
#include "tomahawkwindow.h" #include "tomahawkwindow.h"
#include "settingsdialog.h" #include "settingsdialog.h"
#include <QMessageBox> #include <QMessageBox>
@@ -100,6 +100,7 @@ using namespace Tomahawk;
TomahawkApp::TomahawkApp( int& argc, char *argv[] ) TomahawkApp::TomahawkApp( int& argc, char *argv[] )
: TOMAHAWK_APPLICATION( argc, argv ) : TOMAHAWK_APPLICATION( argc, argv )
, m_audioEngine( 0 )
, m_zeroconf( 0 ) , m_zeroconf( 0 )
, m_settings( 0 ) , m_settings( 0 )
, m_nam( 0 ) , m_nam( 0 )
@@ -111,7 +112,6 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
#ifdef TOMAHAWK_HEADLESS #ifdef TOMAHAWK_HEADLESS
m_headless = true; m_headless = true;
#else #else
m_audioEngine = 0;
m_mainwindow = 0; m_mainwindow = 0;
m_headless = arguments().contains( "--headless" ); m_headless = arguments().contains( "--headless" );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) ); setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
@@ -129,12 +129,12 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
setupLogfile(); setupLogfile();
m_settings = new TomahawkSettings( this ); m_settings = new TomahawkSettings( this );
m_audioEngine = new AudioEngine;
setupDatabase(); setupDatabase();
#ifndef TOMAHAWK_HEADLESS #ifndef TOMAHAWK_HEADLESS
if ( !m_headless ) if ( !m_headless )
{ {
m_audioEngine = new AudioEngine;
#ifndef NO_LIBLASTFM #ifndef NO_LIBLASTFM
m_scrobbler = new Scrobbler( this ); m_scrobbler = new Scrobbler( this );