From b5252c05a2f95dc552ef409ca26eed171cb6b3d6 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Fri, 17 Apr 2015 15:16:56 -0700 Subject: [PATCH] Remove all aboutToFinish/expectStop related things --- src/libtomahawk/audio/AudioEngine.cpp | 17 +++++------------ src/libtomahawk/audio/AudioEngine.h | 1 - src/libtomahawk/audio/AudioEngine_p.h | 1 - src/libtomahawk/audio/AudioOutput.cpp | 26 -------------------------- src/libtomahawk/audio/AudioOutput.h | 2 -- 5 files changed, 5 insertions(+), 42 deletions(-) diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp index 90218405f..db1fa2dee 100644 --- a/src/libtomahawk/audio/AudioEngine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -55,7 +55,7 @@ static QString s_aeInfoIdentifier = QString( "AUDIOENGINE" ); void AudioEnginePrivate::onStateChanged( AudioOutput::AudioState newState, AudioOutput::AudioState oldState ) { - tDebug() << Q_FUNC_INFO << oldState << newState << expectStop << q_ptr->state(); + tDebug() << Q_FUNC_INFO << oldState << newState << q_ptr->state(); if ( newState == AudioOutput::Loading ) { @@ -127,9 +127,8 @@ AudioEnginePrivate::onStateChanged( AudioOutput::AudioState newState, AudioOutpu break; } - if ( stopped && expectStop ) + if ( stopped ) { - expectStop = false; tDebug() << "Finding next track."; if ( q_ptr->canGoNext() ) { @@ -143,6 +142,8 @@ AudioEnginePrivate::onStateChanged( AudioOutput::AudioState newState, AudioOutpu q_ptr->stop(); } } +#if 0 + //This is obsolete, we always expect stop else if ( stopped ) { // We did not expect a Stop here, so do not go to the next track @@ -152,6 +153,7 @@ AudioEnginePrivate::onStateChanged( AudioOutput::AudioState newState, AudioOutpu // an stream that cannot be paused. q_ptr->setState( AudioEngine::Stopped ); } +#endif } } @@ -173,7 +175,6 @@ AudioEngine::AudioEngine() Q_D( AudioEngine ); d->timeElapsed = 0; - d->expectStop = false; d->waitingOnNewTrack = false; d->state = Stopped; d->coverTempFile = 0; @@ -185,7 +186,6 @@ AudioEngine::AudioEngine() connect( d->audioOutput, SIGNAL( stateChanged( AudioOutput::AudioState, AudioOutput::AudioState ) ), d_func(), SLOT( onStateChanged( AudioOutput::AudioState, AudioOutput::AudioState ) ) ); connect( d->audioOutput, SIGNAL( tick( qint64 ) ), SLOT( timerTriggered( qint64 ) ) ); - connect( d->audioOutput, SIGNAL( aboutToFinish() ), SLOT( onAboutToFinish() ) ); setVolume( TomahawkSettings::instance()->volume() ); @@ -1038,13 +1038,6 @@ AudioEngine::onPlaylistNextTrackAvailable() } -void -AudioEngine::onAboutToFinish() -{ - tDebug( LOGVERBOSE ) << Q_FUNC_INFO; - d_func()->expectStop = true; -} - void AudioEngine::timerTriggered( qint64 time ) { diff --git a/src/libtomahawk/audio/AudioEngine.h b/src/libtomahawk/audio/AudioEngine.h index aff5e24f6..b165c5b2b 100644 --- a/src/libtomahawk/audio/AudioEngine.h +++ b/src/libtomahawk/audio/AudioEngine.h @@ -187,7 +187,6 @@ private slots: void loadPreviousTrack(); void loadNextTrack(); - void onAboutToFinish(); void onVolumeChanged( qreal volume ); void timerTriggered( qint64 time ); diff --git a/src/libtomahawk/audio/AudioEngine_p.h b/src/libtomahawk/audio/AudioEngine_p.h index 824b85a53..f1ea033e3 100644 --- a/src/libtomahawk/audio/AudioEngine_p.h +++ b/src/libtomahawk/audio/AudioEngine_p.h @@ -37,7 +37,6 @@ private: AudioOutput* audioOutput; unsigned int timeElapsed; - bool expectStop; bool waitingOnNewTrack; AudioState state; diff --git a/src/libtomahawk/audio/AudioOutput.cpp b/src/libtomahawk/audio/AudioOutput.cpp index 7de589e17..921647af5 100644 --- a/src/libtomahawk/audio/AudioOutput.cpp +++ b/src/libtomahawk/audio/AudioOutput.cpp @@ -37,8 +37,6 @@ #include #include -static const float ABOUT_TO_FINISH_POS = 0.95f; - AudioOutput* AudioOutput::s_instance = 0; @@ -59,7 +57,6 @@ AudioOutput::AudioOutput( QObject* parent ) , m_volume( 1.0 ) , m_currentTime( 0 ) , m_totalTime( 0 ) - , m_aboutToFinish( false ) , m_justSeeked( false ) , dspPluginCallback( nullptr ) , m_vlcInstance( nullptr ) @@ -278,7 +275,6 @@ AudioOutput::setCurrentSource( MediaStream* stream ) libvlc_media_add_option_flag(m_vlcMedia, imemSeek, libvlc_media_option_trusted); } - m_aboutToFinish = false; setState( Stopped ); } @@ -312,15 +308,6 @@ AudioOutput::setCurrentPosition( float position ) //tDebug() << Q_FUNC_INFO << position; AudioEngine::instance()->positionChanged(position); m_havePosition = position > 0.0; - if ( position < ABOUT_TO_FINISH_POS ) - { - m_aboutToFinish = false; - } - else if ( !m_aboutToFinish ) - { - m_aboutToFinish = true; - emit aboutToFinish(); - } } void @@ -352,19 +339,6 @@ AudioOutput::setCurrentTime( qint64 time ) } else { m_seekable = true; } - - if ( !m_havePosition ) - { - if ( time < ABOUT_TO_FINISH_POS * total ) - { - m_aboutToFinish = false; - } - else if ( !m_aboutToFinish ) - { - m_aboutToFinish = true; - emit aboutToFinish(); - } - } } diff --git a/src/libtomahawk/audio/AudioOutput.h b/src/libtomahawk/audio/AudioOutput.h index ed314619f..b024abe2d 100644 --- a/src/libtomahawk/audio/AudioOutput.h +++ b/src/libtomahawk/audio/AudioOutput.h @@ -74,7 +74,6 @@ public slots: signals: void stateChanged( AudioOutput::AudioState, AudioOutput::AudioState ); void tick( qint64 ); - void aboutToFinish(); private: void setState( AudioState state ); @@ -97,7 +96,6 @@ private: qreal m_volume; qint64 m_currentTime; qint64 m_totalTime; - bool m_aboutToFinish; bool m_justSeeked; std::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > dspPluginCallback;