mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-06 00:52:34 +02:00
Code Issues Releases Wiki Activity

* Fixed started() being emitted too often and removed obsolete volume hack.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2013-01-04 14:44:06 +01:00
parent 4b886a1657
commit c884615ef1
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AudioControls.cpp
View File

@ -212,6 +212,7 @@ AudioControls::onControlStateChanged()
void
AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
{
tDebug() << "FOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO";
if ( result.isNull() )
return;

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

@ -451,6 +451,7 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
if ( !err )
{
tLog() << "Starting new song:" << m_currentTrack->url();
m_state = Loading;
emit loading( m_currentTrack );
if ( !isHttpResult( m_currentTrack->url() ) && !isLocalResult( m_currentTrack->url() ) )
@ -736,8 +737,17 @@ AudioEngine::onAboutToFinish()
void
AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
{
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << oldState << newState << m_expectStop;
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << oldState << newState << m_expectStop << state();
if ( newState == Phonon::LoadingState )
{
// We don't emit this state to listeners - yet.
m_state = Loading;
}
if ( newState == Phonon::StoppedState )
{
m_state = Stopped;
}
if ( newState == Phonon::ErrorState )
{
stop( UnknownError );
@ -749,7 +759,9 @@ AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
}
if ( newState == Phonon::PlayingState )
{
emit started( m_currentTrack );
if ( state() != Paused && state() != Playing )
emit started( m_currentTrack );
setState( Playing );
}
@ -982,17 +994,12 @@ AudioEngine::checkStateQueue()
{
case Playing:
{
bool paused = isPaused();
m_mediaObject->play();
if ( paused )
setVolume( m_volume );
break;
}
case Paused:
{
m_volume = volume();
m_mediaObject->pause();
break;
}

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

@ -42,7 +42,7 @@ Q_OBJECT
public:
enum AudioErrorCode { StreamReadError, AudioDeviceError, DecodeError, UnknownError, NoError };
enum AudioState { Stopped, Playing, Paused, Error };
enum AudioState { Stopped, Playing, Paused, Error, Loading };
static AudioEngine* instance();
@ -171,7 +171,6 @@ private:
bool m_waitingOnNewTrack;
mutable QStringList m_supportedMimeTypes;
unsigned int m_volume;
AudioState m_state;
QQueue< AudioState > m_stateQueue;