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

Fix style

Browse Source
This commit is contained in:
Leo Franchi
2012-05-19 12:20:29 -04:00
parent 337423c52f
commit b2c281ad37
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -158,14 +158,14 @@ AudioEngine::pause()
void void
AudioEngine::stop(AudioErrorCode errorCode) AudioEngine::stop( AudioErrorCode errorCode )
{ {
tDebug( LOGEXTRA ) << Q_FUNC_INFO; tDebug( LOGEXTRA ) << Q_FUNC_INFO;
if ( isStopped() ) if ( isStopped() )
return; return;
if(errorCode == NoError) if( errorCode == NoError )
setState( Stopped ); setState( Stopped );
else else
setState( Error ); setState( Error );
@@ -671,7 +671,7 @@ AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
tLog() << "Phonon Error:" << m_mediaObject->errorString() << m_mediaObject->errorType(); tLog() << "Phonon Error:" << m_mediaObject->errorString() << m_mediaObject->errorType();
emit error( UnknownError ); emit error( UnknownError );
setState(Error); setState( Error );
return; return;
} }
@@ -792,13 +792,10 @@ AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
Tomahawk::result_ptr lastTrack = m_currentTrack; Tomahawk::result_ptr lastTrack = m_currentTrack;
if ( !lastTrack.isNull() ) if ( !lastTrack.isNull() )
{ {
if(m_state != Error) if ( m_state != Error && TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening )
{ {
if ( TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening ) DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( lastTrack, DatabaseCommand_LogPlayback::Finished, m_timeElapsed );
{ Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( lastTrack, DatabaseCommand_LogPlayback::Finished, m_timeElapsed );
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
}
} }
emit finished( lastTrack ); emit finished( lastTrack );

2
src/libtomahawk/audio/AudioEngine.h
View File

@@ -76,7 +76,7 @@ public slots:
void playPause(); void playPause();
void play(); void play();
void pause(); void pause();
void stop(AudioErrorCode errorCode = NoError); void stop( AudioErrorCode errorCode = NoError );
void previous(); void previous();
void next(); void next();