diff options
| -rw-r--r-- | src/plugins/Effect/crossfade/crossfadeplugin.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/General/notifier/notifier.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/Effect/crossfade/crossfadeplugin.cpp b/src/plugins/Effect/crossfade/crossfadeplugin.cpp index c7059cd6e..22e5c3fdc 100644 --- a/src/plugins/Effect/crossfade/crossfadeplugin.cpp +++ b/src/plugins/Effect/crossfade/crossfadeplugin.cpp @@ -53,13 +53,12 @@ void CrossfadePlugin::applyEffect(Buffer *b) StateHandler::instance()->sendNextTrackRequest(); m_state = CHECKING; } - return; + break; case CHECKING: //next source has been received and current engine will be used to play it if(SoundCore::instance()->nextTrackAccepted()) m_state = PREPARING; - else - return; + break; case PREPARING: if(m_core->totalTime() && (m_core->totalTime() - m_handler->elapsed() < m_overlap)) { @@ -71,12 +70,10 @@ void CrossfadePlugin::applyEffect(Buffer *b) memcpy(m_buffer + m_buffer_at, b->data, b->samples * sizeof(float)); m_buffer_at += b->samples; b->samples = 0; - return; } else if(m_buffer_at > 0) m_state = PROCESSING; - else - return; + break; case PROCESSING: if (m_buffer_at > 0) { @@ -88,6 +85,7 @@ void CrossfadePlugin::applyEffect(Buffer *b) } else m_state = WAITING; + break; default: ; } diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index 2b7b2a6bf..3846223ae 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2017 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -101,8 +101,8 @@ void Notifier::setState(Qmmp::State state) { showMetaData(); m_isPaused = false; - break; } + break; } case Qmmp::Paused: { |