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

* Fixed merging mistake.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-01-22 08:15:44 +01:00
parent f82f98785f
commit 413c3ed36e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -14,7 +14,7 @@ ELSE()
ENDIF() ENDIF()
FIND_PACKAGE( Taglib 1.6.0 REQUIRED ) FIND_PACKAGE( Taglib 1.6.0 REQUIRED )
FIND_PACKAGE( LibLastFm REQUIRED ) FIND_PACKAGE( LibLastFm 0.3.3 REQUIRED )
FIND_PACKAGE( LibEchonest REQUIRED ) FIND_PACKAGE( LibEchonest REQUIRED )
IF( UNIX AND NOT APPLE ) IF( UNIX AND NOT APPLE )

2
src/audiocontrols.cpp
View File

@@ -134,7 +134,7 @@ AudioControls::AudioControls( QWidget* parent )
connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( onPlaybackPaused() ) ); connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( onPlaybackPaused() ) );
connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onPlaybackResumed() ) ); connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onPlaybackResumed() ) );
connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ) ); connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ) );
connect( AudioEngine::instance(), SIGNAL( timerSeconds( unsigned int ) ), SLOT( onPlaybackTimer( unsigned int ) ) ); connect( AudioEngine::instance(), SIGNAL( timerMilliSeconds( qint64 ) ), SLOT( onPlaybackTimer( qint64 ) ) );
connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) ); connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) );
m_defaultCover = QPixmap( RESPATH "images/no-album-art-placeholder.png" ) m_defaultCover = QPixmap( RESPATH "images/no-album-art-placeholder.png" )

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

@@ -45,12 +45,10 @@ AudioEngine::~AudioEngine()
{ {
qDebug() << Q_FUNC_INFO << "waiting for event loop to finish..."; qDebug() << Q_FUNC_INFO << "waiting for event loop to finish...";
m_mediaObject->stop(); stop();
delete m_audioOutput; delete m_audioOutput;
delete m_mediaObject; delete m_mediaObject;
m_input.clear();
} }